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 webrender #22237

Merged
merged 1 commit into from Nov 28, 2018
Merged

Update webrender #22237

merged 1 commit into from Nov 28, 2018

Conversation

@Manishearth
Copy link
Member

Manishearth commented Nov 21, 2018

Fixes #22232 , once servo/webrender#3327 lands and I update this PR to include it

All the integer casts are due to servo/webrender#3291


This change is Reviewable

@highfive
Copy link

highfive commented Nov 21, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/window.rs, components/webdriver_server/lib.rs, components/script/dom/screen.rs, components/script/dom/htmlmediaelement.rs
  • @jgraham: components/webdriver_server/lib.rs
  • @KiChjang: components/script/dom/window.rs, components/script/dom/screen.rs, components/net/image_cache.rs, components/script_traits/script_msg.rs, components/script/dom/htmlmediaelement.rs and 1 more
  • @paulrouget: components/compositing/compositor.rs, ports/servo/glutin_app/window.rs, components/compositing/windowing.rs, components/compositing/compositor_thread.rs
  • @emilio: components/layout/display_list/builder.rs, components/layout/display_list/border.rs
@highfive
Copy link

highfive commented Nov 21, 2018

warning Warning warning

  • These commits modify net, layout, and script code, but no tests are modified. Please consider adding a test!
@Manishearth Manishearth force-pushed the Manishearth:wrup branch from afd4bc4 to 5b10eac Nov 21, 2018
Cargo.lock Outdated
@@ -4913,6 +4940,7 @@ dependencies = [
"checksum ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9826188e666f2ed92071d2dadef6edc430b11b158b5b2b3f4babbcc891eaaa"
"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
"checksum image 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebdff791af04e30089bde8ad2a632b86af433b40c04db8d70ad4b21487db7a6a"
"checksum image 0.20.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44665b4395d1844c96e7dc8ed5754782a1cdfd9ef458a80bbe45702681450504"

This comment has been minimized.

@Eijebong

Eijebong Nov 21, 2018

Member

Wait... Didn't I bum image to 0.20 already ?

This comment has been minimized.

@Manishearth

Manishearth Nov 21, 2018

Author Member

I didn't rebase

This comment has been minimized.

@Eijebong

Eijebong Nov 21, 2018

Member

Ha 👍
Thought I was going crazy

@Manishearth Manishearth force-pushed the Manishearth:wrup branch from 5b10eac to e501be3 Nov 21, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Nov 21, 2018

heh, this update wasn't even necessary to diagnose that bug because we already had the relevant commits on master.

Either way, might as well land it.

@bors-servo try

@Manishearth Manishearth force-pushed the Manishearth:wrup branch from e501be3 to aa127fd Nov 21, 2018
@paulrouget
Copy link
Contributor

paulrouget commented Nov 21, 2018

error[E0432]: unresolved imports `servo::webrender_api::DeviceUintRect`, `servo::webrender_api::DeviceUintSize`
  --> ports/servo/glutin_app/window.rs:21:44
   |
21 | use servo::webrender_api::{DeviceIntPoint, DeviceUintRect, DeviceUintSize, ScrollLocation};
   |                                            ^^^^^^^^^^^^^^  ^^^^^^^^^^^^^^ no `DeviceUintSize` in `webrender_api`. Did you mean to use `DeviceIntSize`?
   |                                            |
   |                                            no `DeviceUintRect` in `webrender_api`. Did you mean to use `DeviceIntRect`?
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:701:34
    |
701 |                     framebuffer: inner_size,
    |                                  ^^^^^^^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:702:30
    |
702 |                     window: (win_size, win_origin),
    |                              ^^^^^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:703:29
    |
703 |                     screen: screen,
    |                             ^^^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:705:35
    |
705 |                     screen_avail: screen,
    |                                   ^^^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:715:34
    |
715 |                     framebuffer: size,
    |                                  ^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:716:30
    |
716 |                     window: (size, TypedPoint2D::zero()),
    |                              ^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:717:29
    |
717 |                     screen: size,
    |                             ^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error[E0308]: mismatched types
   --> ports/servo/glutin_app/window.rs:718:35
    |
718 |                     screen_avail: size,
    |                                   ^^^^ expected i32, found u32
    |
    = note: expected type `euclid::size::TypedSize2D<i32, _>`
               found type `euclid::size::TypedSize2D<u32, _>`
                                                                                
error: aborting due to 9 previous errors
@Manishearth
Copy link
Member Author

Manishearth commented Nov 21, 2018

lol I was only building for android so I didn't do the normal build. Will fix.

@Manishearth Manishearth force-pushed the Manishearth:wrup branch from aa127fd to 35c31f9 Nov 21, 2018
@paulrouget
Copy link
Contributor

paulrouget commented Nov 21, 2018

I'm ok with that change, but it doesn't appear to fix #22232.

@paulrouget
Copy link
Contributor

paulrouget commented Nov 21, 2018

once servo/webrender#3327 lands

oh :)

@Manishearth Manishearth force-pushed the Manishearth:wrup branch from 35c31f9 to 8a2533d Nov 21, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Nov 21, 2018

Yeah -- I did all the work for the update whilst bisecting anyway, so made this pr for immediate landing.

And then realized that the fix was in an open WR PR, so I'm just waiting for it to land before I finalize this.

@bors-servo
Copy link
Contributor

bors-servo commented Nov 21, 2018

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

@atouchet
Copy link
Contributor

atouchet commented Nov 27, 2018

servo/webrender#3338 has been merged.

@Manishearth Manishearth force-pushed the Manishearth:wrup branch from 8a2533d to 69db34d Nov 27, 2018
@pcwalton
Copy link
Contributor

pcwalton commented Nov 27, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 27, 2018

📌 Commit 69db34d has been approved by pcwalton

@Manishearth
Copy link
Member Author

Manishearth commented Nov 28, 2018

Ah, it's the same intermittent as in #20633

the test doesn't try to render much so I suspect this is a general intermittent

@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2018

💔 Test failed - magicleap

@Manishearth Manishearth force-pushed the Manishearth:wrup branch from eed29c0 to 5413328 Nov 28, 2018
@Manishearth
Copy link
Member Author

Manishearth commented Nov 28, 2018

@bors-servo r=pcwalton

so many new builders to gate on

@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2018

📌 Commit 5413328 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2018

Testing commit 5413328 with merge 3bf3367...

bors-servo added a commit that referenced this pull request Nov 28, 2018
Update webrender

Fixes #22232 , once servo/webrender#3327 lands and I update this PR to include it

All the integer casts are due to servo/webrender#3291

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

bors-servo commented Nov 28, 2018

💔 Test failed - linux-rel-css

@Manishearth
Copy link
Member Author

Manishearth commented Nov 28, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2018

Testing commit 5413328 with merge f180b84...

bors-servo added a commit that referenced this pull request Nov 28, 2018
Update webrender

Fixes #22232 , once servo/webrender#3327 lands and I update this PR to include it

All the integer casts are due to servo/webrender#3291

<!-- 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/22237)
<!-- Reviewable:end -->
2 similar comments
@bors-servo bors-servo merged commit 5413328 into servo:master Nov 28, 2018
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
@Manishearth Manishearth deleted the Manishearth:wrup branch Jul 11, 2019
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

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