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 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

highfive commented Apr 28, 2017

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

highfive commented Apr 28, 2017

Heads up! This PR modifies the following files:

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

highfive commented Apr 28, 2017

warning Warning warning

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

metajack commented Apr 28, 2017

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

bors-servo commented Apr 29, 2017

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

@Gankra Gankra force-pushed the Gankra:bincode-ipc-5 branch from 504f2aa to f46be5b May 3, 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
Copy link
Contributor

bors-servo commented May 3, 2017

📌 Commit f46be5b has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented May 3, 2017

Testing commit f46be5b with merge 74c36cb...

bors-servo added 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

bors-servo commented May 3, 2017

☀️ 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
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
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

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