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

WR multi-document update - try 2 #17908

Merged
merged 1 commit into from Jul 29, 2017
Merged

WR multi-document update - try 2 #17908

merged 1 commit into from Jul 29, 2017

Conversation

kvark
Copy link
Member

@kvark kvark commented Jul 28, 2017

Combines #17892 with the patch to detach style_traits from webrender_api


  • There are tests for these changes OR
  • These changes do not require tests because _____ new logic is added

This change is Reviewable

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

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 7a25897 has been approved by asajeffrey

@highfive highfive assigned asajeffrey and unassigned jdm Jul 28, 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 Jul 28, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 7a25897 with merge 50fc9a2...

bors-servo pushed a commit that referenced this pull request Jul 28, 2017
Make webrender_api a servo-only dependency of style_traits

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix  #17907

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because _____ new logic is added

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

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

💔 Test failed - linux-rel-css

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 28, 2017
@emilio
Copy link
Member

emilio commented Jul 28, 2017

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, windows-msvc-dev are reusable. Rebuilding only linux-rel-css, mac-rel-css2, mac-rel-wpt4...

@bors-servo
Copy link
Contributor

⛄ The build was interrupted to prioritize another pull request.

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 29, 2017
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 29, 2017
@kvark kvark changed the title Make webrender_api a servo-only dependency of style_traits WR multi-document update - try 2 Jul 29, 2017
@kvark
Copy link
Member Author

kvark commented Jul 29, 2017

@asajeffrey given that the original PR got reverted, I re-incorporated it here. Please take another look.

@emilio
Copy link
Member

emilio commented Jul 29, 2017

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 101c426 has been approved by emilio

@highfive highfive assigned emilio and unassigned asajeffrey Jul 29, 2017
@highfive highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Jul 29, 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-needs-rebase There are merge conflict errors. labels Jul 29, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 101c426 with merge e552736...

bors-servo pushed a commit that referenced this pull request Jul 29, 2017
WR multi-document update - try 2

<!-- Please describe your changes on the following line: -->
Combines #17892 with the patch to detach style_traits from webrender_api

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix  #17907

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because _____ new logic is added

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/17908)
<!-- 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: emilio
Pushing e552736 to master...

@bors-servo bors-servo merged commit 101c426 into servo:master Jul 29, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 29, 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.

Style (even for gecko) depending on webrender
6 participants