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.

Sign up for GitHub

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

Jump to bottom

Update WR (unrevert border snapping code). #17389

Merged
merged 1 commit into from Jun 18, 2017
Merged

Update WR (unrevert border snapping code). #17389

merged 1 commit into from Jun 18, 2017

Conversation

glennw
Copy link
Member

@glennw glennw commented Jun 18, 2017 •
edited by larsbergstrom

This change is Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 18, 2017
@glennw
Copy link
Member Author

glennw commented Jun 18, 2017

This is a squashed, rebased version of #17297, and updates WR to current master.

@glennw
Copy link
Member Author

glennw commented Jun 18, 2017

r? anyone

@glennw
Copy link
Member Author

glennw commented Jun 18, 2017

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 265f81f with merge 9b87ec0...

bors-servo pushed a commit that referenced this pull request Jun 18, 2017
Auto merge of #17389 - glennw:revert, r=<try>
9b87ec0 
Update WR (unrevert border snapping code).

<!-- 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/17389)
<!-- Reviewable:end -->
@glennw glennw mentioned this pull request Jun 18, 2017
Closed
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
State: approved= try=True

@glennw
Copy link
Member Author

glennw commented Jun 18, 2017

Try run passed. This is good to go once someone signs off on the test expectation changes (more details found in the WIP PR linked above).

@jdm
Copy link
Member

jdm commented Jun 18, 2017

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit 265f81f has been approved by jdm

@highfive highfive assigned jdm and unassigned pcwalton Jun 18, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jun 18, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 265f81f with merge 348c282...

bors-servo pushed a commit that referenced this pull request Jun 18, 2017
Auto merge of #17389 - glennw:revert, r=jdm
348c282 
Update WR (unrevert border snapping code).

<!-- 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/17389)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: jdm
Pushing 348c282 to master...

@bors-servo bors-servo merged commit 265f81f into servo:master Jun 18, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jun 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@glennw @bors-servo @jdm @pcwalton @highfive @Gankra