Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update WR + gleam (nested clip stack, scroll locations). #14412

Merged
merged 1 commit into from Dec 15, 2016

Conversation

@glennw
Copy link
Member

glennw commented Nov 29, 2016

This change is Reviewable

@highfive
Copy link

highfive commented Nov 29, 2016

Heads up! This PR modifies the following files:

  • @emilio: components/layout/webrender_helpers.rs
@highfive
Copy link

highfive commented Nov 29, 2016

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@Manishearth
Copy link
Member

Manishearth commented Nov 29, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Nov 29, 2016

📌 Commit 2809ef2 has been approved by Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Nov 30, 2016

Testing commit 2809ef2 with merge b61451f...

bors-servo added a commit that referenced this pull request Nov 30, 2016
Update WR + gleam (nested clip stack, scroll locations).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14412)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 30, 2016

💔 Test failed - mac-rel-wpt2

@glennw glennw force-pushed the glennw:update-wr-clip-2 branch from 2809ef2 to bd97855 Nov 30, 2016
@glennw
Copy link
Member Author

glennw commented Nov 30, 2016

@bors-servo r=Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Nov 30, 2016

📌 Commit bd97855 has been approved by Manishearth

@bors-servo
Copy link
Contributor

bors-servo commented Dec 1, 2016

Testing commit bd97855 with merge 8cfd8ea...

bors-servo added a commit that referenced this pull request Dec 1, 2016
Update WR + gleam (nested clip stack, scroll locations).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14412)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 1, 2016

💔 Test failed - mac-rel-wpt2

@glennw
Copy link
Member Author

glennw commented Dec 1, 2016

@bors-servo retry

  • Test if the failure is a new intermittent on mac.
@bors-servo
Copy link
Contributor

bors-servo commented Dec 1, 2016

Testing commit bd97855 with merge 6d5f4a8...

bors-servo added a commit that referenced this pull request Dec 1, 2016
Update WR + gleam (nested clip stack, scroll locations).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14412)
<!-- Reviewable:end -->
@glennw
Copy link
Member Author

glennw commented Dec 15, 2016

Woohoo try passed! r? @pcwalton @larsbergstrom @metajack (or anyone) for the last 2 small commits?

@pcwalton
Copy link
Contributor

pcwalton commented Dec 15, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

📌 Commit d1be883 has been approved by pcwalton

@glennw
Copy link
Member Author

glennw commented Dec 15, 2016

@bors-servo try- clean r=pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: #14592
@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

📌 Commit d1be883 has been approved by pcwalton

@glennw
Copy link
Member Author

glennw commented Dec 15, 2016

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

🔒 Merge conflict

@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

The latest upstream changes (presumably #14592) made this pull request unmergeable. Please resolve the merge conflicts.

@glennw glennw force-pushed the glennw:update-wr-clip-2 branch from d1be883 to f517d03 Dec 15, 2016
@glennw
Copy link
Member Author

glennw commented Dec 15, 2016

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

📌 Commit f517d03 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

Testing commit f517d03 with merge bffac0f...

bors-servo added a commit that referenced this pull request Dec 15, 2016
Update WR + gleam (nested clip stack, scroll locations).

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14412)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Dec 15, 2016

@bors-servo bors-servo merged commit f517d03 into servo:master Dec 15, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Dec 15, 2016
4 of 4 tasks complete
@kvark
Copy link
Member

kvark commented Dec 15, 2016

YES!

@glennw glennw deleted the glennw:update-wr-clip-2 branch Dec 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
You can’t perform that action at this time.