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 to webrender's new bincode IPC #16652

Merged
merged 2 commits into from
May 3, 2017
Merged

Conversation

Gankra
Copy link
Contributor

@Gankra Gankra commented Apr 28, 2017

DO NO MERGE YET

This is the required update to Servo for my changes to webrender in servo/webrender#1181


This change is Reviewable

@highfive
Copy link

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @metajack (or someone else) soon.

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @emilio: components/layout/webrender_helpers.rs

@highfive
Copy link

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 28, 2017
@metajack
Copy link
Contributor

I assume this will need a WR version bump as well. These changes look pretty minimal, so they seem fine :)

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Apr 29, 2017
@Gankra
Copy link
Contributor Author

Gankra commented May 3, 2017

Ok servo/webrender#1181 landed, this is ready to go.

@jdm
Copy link
Member

jdm commented May 3, 2017

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit f46be5b has been approved by jdm

@highfive highfive assigned jdm and unassigned metajack May 3, 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. S-needs-rebase There are merge conflict errors. labels May 3, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit f46be5b with merge 74c36cb...

bors-servo pushed a commit that referenced this pull request May 3, 2017
Update to webrender's new bincode IPC

**DO NO MERGE YET**

This is the required update to Servo for my changes to webrender in servo/webrender#1181

<!-- 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/16652)
<!-- 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-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: jdm
Pushing 74c36cb to master...

@bors-servo bors-servo merged commit f46be5b into servo:master May 3, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label May 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants