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

WR multi-document update #17892

Merged
merged 1 commit into from
Jul 28, 2017
Merged

WR multi-document update #17892

merged 1 commit into from
Jul 28, 2017

Conversation

kvark
Copy link
Member

@kvark kvark commented Jul 27, 2017 •
edited by larsbergstrom
Loading

The PR updates WR version to support multiple documents (servo/webrender#1509) but doesn't take advantage of this new feature yet.
It also makes Servo to use DevicePixel from WR instead of rolling out another one.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____ no extra logic

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/pipeline.rs, components/constellation/constellation.rs
  • @fitzgen: components/script_traits/lib.rs, components/script_traits/lib.rs
  • @KiChjang: components/script_traits/lib.rs, components/script_traits/lib.rs

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

glennw commented Jul 27, 2017

Nice!

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 640a953 has been approved by glennw

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

⌛ Testing commit 640a953 with merge 7b492d7...

bors-servo pushed a commit that referenced this pull request Jul 27, 2017
Auto merge of #17892 - kvark:wr, r=glennw
7b492d7 
WR multi-document update

<!-- Please describe your changes on the following line: -->
The PR updates WR version to support multiple documents (servo/webrender#1509) but doesn't take advantage of this new feature yet.
It also makes Servo to use `DevicePixel` from WR instead of rolling out another one.

---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

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

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

💔 Test failed - mac-dev-unit

@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 27, 2017
@jdm
Copy link
Member

jdm commented Jul 27, 2017

./mach build-cef needs to be fixed.

@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 28, 2017
@kvark
Copy link
Member Author

kvark commented Jul 28, 2017

Thanks @jdm !
@bors-servo r=glennw

@bors-servo
Copy link
Contributor

📌 Commit 6286aca has been approved by glennw

@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 6286aca with merge d945466...

bors-servo pushed a commit that referenced this pull request Jul 28, 2017
Auto merge of #17892 - kvark:wr, r=glennw
d945466 
WR multi-document update

<!-- Please describe your changes on the following line: -->
The PR updates WR version to support multiple documents (servo/webrender#1509) but doesn't take advantage of this new feature yet.
It also makes Servo to use `DevicePixel` from WR instead of rolling out another one.

---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

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

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

💔 Test failed - linux-rel-wpt

@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
@jdm
Copy link
Member

jdm commented Jul 28, 2017

@bors-servo: retry

@bors-servo
Copy link
Contributor

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

@bors-servo bors-servo mentioned this pull request Jul 28, 2017
Merged
4 tasks
@mrobinson
Copy link
Member

@bors-servo retry

@bors-servo
Copy link
Contributor

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

@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-wpt

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 28, 2017
@jdm
Copy link
Member

jdm commented Jul 28, 2017

This feels like WR has broken some webgl feature.

@kvark
Copy link
Member Author

kvark commented Jul 28, 2017

@jdm it is quite possible, since I was re-arranging WebGL flushes.
I'll do another pass to see if the logic has changed.
cc @MortimerGoro - want to check out servo/webrender#1509 ?

@MortimerGoro
Copy link
Contributor

@kvark I think that the problem is that current_bound_webgl_context_id gets dirty after a flush_webgl(). Try setting current_bound_webgl_context_id to None.

@kvark
Copy link
Member Author

kvark commented Jul 28, 2017 •
edited
Loading

@MortimerGoro yep, I saw that. Should be fixed by servo/webrender#1530

@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 28, 2017
@kvark
Copy link
Member Author

kvark commented Jul 28, 2017

No code changes to this PR, just getting past the WebGL PR in WR that is supposed to fix the issues here.
@bors-servo r=glennw

@bors-servo
Copy link
Contributor

📌 Commit 8c588e8 has been approved by glennw

@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 8c588e8 with merge 12a49dc...

bors-servo pushed a commit that referenced this pull request Jul 28, 2017
Auto merge of #17892 - kvark:wr, r=glennw
12a49dc 
WR multi-document update

<!-- Please describe your changes on the following line: -->
The PR updates WR version to support multiple documents (servo/webrender#1509) but doesn't take advantage of this new feature yet.
It also makes Servo to use `DevicePixel` from WR instead of rolling out another one.

---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

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

<!-- 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/17892)
<!-- 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: glennw
Pushing 12a49dc to master...

@bors-servo bors-servo merged commit 8c588e8 into servo:master Jul 28, 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 28, 2017
@bors-servo bors-servo mentioned this pull request Jul 28, 2017
Merged
4 tasks
@kvark kvark deleted the wr branch July 28, 2017 19:33
This was referenced Jul 28, 2017
Merged
Merged
@moz-servo-sync moz-servo-sync mentioned this pull request Jul 28, 2017
Merged
moz-servo-sync pushed a commit to moz-servo-sync/servo that referenced this pull request Jul 28, 2017
@moz-servo-sync
Backed out changeset c424ad1c5f94 for build failures a=backout CLOSED…
3f1af3e 
… TREE

Backs out servo#17892
bors-servo pushed a commit that referenced this pull request Jul 28, 2017
Auto merge of #17910 - moz-servo-sync:gecko-backout, r=moz-servo-sync
ef2d48d 
Multiple gecko backouts

Backed out changeset a417b9d7712d for vendoring bustage. r=backout on a CLOSED TREE

Backs out #17565

<!-- 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/17910)
<!-- Reviewable:end -->

---

Backed out changeset c424ad1c5f94 for build failures a=backout CLOSED TREE

Backs out #17892
@kvark kvark mentioned this pull request Jul 29, 2017
Merged
5 tasks
bors-servo pushed a commit that referenced this pull request Jul 29, 2017
Auto merge of #17908 - kvark:wr, r=emilio
e552736 
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 -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@glennw glennw

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@kvark @highfive @glennw @bors-servo @jdm @mrobinson @MortimerGoro @asajeffrey