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

Upgrade WebRender #23516

Merged
merged 18 commits into from Jul 12, 2019
Merged

Upgrade WebRender #23516

merged 18 commits into from Jul 12, 2019

Conversation

@pcwalton
Copy link
Contributor

pcwalton commented Jun 5, 2019

This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #23516
  • There are tests for these changes

This change is Reviewable

@highfive
Copy link

highfive commented Jun 5, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/screen.rs, components/script/dom/window.rs
  • @KiChjang: components/script/dom/screen.rs, components/net/image_cache.rs, components/script/dom/window.rs, components/script_traits/lib.rs, components/script_traits/script_msg.rs
  • @paulrouget: components/compositing/compositor_thread.rs, ports/servo/glutin_app/window.rs, components/servo/lib.rs, components/compositing/compositor.rs, components/compositing/windowing.rs
  • @emilio: components/layout/display_list/items.rs, components/layout/display_list/conversions.rs, components/layout/display_list/border.rs, components/layout/display_list/webrender_helpers.rs, components/layout/sequential.rs and 4 more
@highfive
Copy link

highfive commented Jun 5, 2019

warning Warning warning

  • These commits modify net, layout, and script code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member

jdm commented Jun 5, 2019

@pcwalton The RNG crate problems can usually be resolved by upgrading the crates in question.

@pcwalton pcwalton force-pushed the pcwalton:webrenderup branch from ee56782 to c8bcbd1 Jun 5, 2019
@pcwalton
Copy link
Contributor Author

pcwalton commented Jun 5, 2019

OK, this one should work.

@ferjm ferjm assigned jdm and unassigned ferjm Jun 5, 2019
@jdm
Copy link
Member

jdm commented Jun 5, 2019

@bors-servo try=wpt

@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2019

Trying commit c8bcbd1 with merge 9f34412...

bors-servo added a commit that referenced this pull request Jun 5, 2019
Upgrade WebRender

This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up.

---
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

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

bors-servo commented Jun 5, 2019

💔 Test failed - linux-rel-wpt

@jdm jdm mentioned this pull request Jun 6, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Jun 12, 2019

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

@jdm jdm force-pushed the pcwalton:webrenderup branch from c8bcbd1 to 9913fd9 Jun 13, 2019
@jdm
Copy link
Member

jdm commented Jun 13, 2019

@bors-servo try=wpt

@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2019

Trying commit 9913fd9 with merge 65873e6...

bors-servo added a commit that referenced this pull request Jun 13, 2019
Upgrade WebRender

This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up.

---
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- 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/23516)
<!-- Reviewable:end -->
@jdm
Copy link
Member

jdm commented Jun 13, 2019

This should have addressed all of the previous test failures. Thank you for doing all of the preliminary work, @pcwalton!

@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2019

💔 Test failed - linux-rel-wpt

@Eijebong
Copy link
Member

Eijebong commented Jun 13, 2019

error: unused variable: `clip`
    --> components/layout/display_list/builder.rs:1446:9
     |
1446 |         clip: Rect<Au>,
     |         ^^^^ help: consider prefixing with an underscore: `_clip`
     |
     = note: `-D unused-variables` implied by `-D warnings`

error: aborting due to previous error

Also this needs to be rebased after the diverse rand update thingy (it should dedupe ws and sha1 too)

@jdm jdm force-pushed the pcwalton:webrenderup branch from 9913fd9 to bf3878d Jun 14, 2019
@jdm
Copy link
Member

jdm commented Jun 14, 2019

@bors-servo try=wpt

@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2019

Trying commit bf3878d with merge e558e96...

@bors-servo
Copy link
Contributor

bors-servo commented Jul 12, 2019

Testing commit a839835 with merge 8b2e09e...

bors-servo added a commit that referenced this pull request Jul 12, 2019
Upgrade WebRender

This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up.

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

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

bors-servo commented Jul 12, 2019

💔 Test failed - status-taskcluster

@CYBAI
Copy link
Collaborator

CYBAI commented Jul 12, 2019

This one pass again in the second Mac build 👀 other failures in other mac builds are #23290

{
  "status": "PASS",
  "group": "default",
  "message": null,
  "stack": null,
  "subtest": null,
  "test": "/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html",
  "line": 2057,
  "action": "test_result",
  "expected": "FAIL"
}

besides, in magicleap build:

error[E0432]: unresolved import `servo::webrender_api::DevicePixel`
  --> ports/libmlservo/src/lib.rs:17:5
   |
17 | use servo::webrender_api::DevicePixel;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `DevicePixel` in `webrender_api`

error[E0432]: unresolved import `servo::webrender_api::DevicePoint`
  --> ports/libmlservo/src/lib.rs:18:5
   |
18 | use servo::webrender_api::DevicePoint;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `DevicePoint` in `webrender_api`

error[E0432]: unresolved import `servo::webrender_api::LayoutPixel`
  --> ports/libmlservo/src/lib.rs:19:5
   |
19 | use servo::webrender_api::LayoutPixel;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `LayoutPixel` in `webrender_api`

error: aborting due to 3 previous errors
@jdm jdm force-pushed the pcwalton:webrenderup branch from 7ee7be9 to 30ea282 Jul 12, 2019
@jdm
Copy link
Member

jdm commented Jul 12, 2019

@bors-servo r=pcwalton,jdm

@bors-servo
Copy link
Contributor

bors-servo commented Jul 12, 2019

📌 Commit 30ea282 has been approved by pcwalton,jdm

@highfive highfive assigned pcwalton and unassigned jdm Jul 12, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Jul 12, 2019

Testing commit 30ea282 with merge df73c71...

bors-servo added a commit that referenced this pull request Jul 12, 2019
Upgrade WebRender

This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up.

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

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

bors-servo commented Jul 12, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: pcwalton,jdm
Pushing df73c71 to master...

@bors-servo bors-servo merged commit 30ea282 into servo:master Jul 12, 2019
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
Taskcluster (pull_request) TaskGroup: success
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.

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