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 commented Jul 28, 2017

Combines #17892 with the patch to detach style_traits from webrender_api


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #17907
  • There are tests for these changes OR
  • These changes do not require tests because _____ new logic is added

This change is Reviewable

@asajeffrey
Copy link
Member

asajeffrey commented Jul 28, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

📌 Commit 7a25897 has been approved by asajeffrey

@highfive highfive assigned asajeffrey and unassigned jdm Jul 28, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

Testing commit 7a25897 with merge 50fc9a2...

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

bors-servo commented Jul 28, 2017

💔 Test failed - linux-rel-css

@emilio
Copy link
Member

emilio commented Jul 28, 2017

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

The build was interrupted to prioritize another pull request.

@bors-servo
Copy link
Contributor

bors-servo commented Jul 29, 2017

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

@kvark kvark force-pushed the kvark:wr branch from 7a25897 to 101c426 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
Copy link
Contributor

bors-servo commented Jul 29, 2017

📌 Commit 101c426 has been approved by emilio

@highfive highfive assigned emilio and unassigned asajeffrey Jul 29, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jul 29, 2017

Testing commit 101c426 with merge e552736...

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

bors-servo commented Jul 29, 2017

@bors-servo bors-servo merged commit 101c426 into servo:master Jul 29, 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.

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