From c879584a1933d29b86059618dc5245af453639fa Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Mon, 24 Apr 2017 13:09:44 +1000 Subject: [PATCH] Update WR (new groove/ridge border path, mix-blend-mode optimizations) A few other minor additions too. --- Cargo.lock | 54 +++++++++---------- components/layout/webrender_helpers.rs | 1 - components/webvr/webvr_thread.rs | 7 +-- .../html/mix-blend-mode-animation.htm.ini | 3 -- ...-overflow-hidden-and-border-radius.htm.ini | 3 -- 5 files changed, 31 insertions(+), 37 deletions(-) delete mode 100644 tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-animation.htm.ini delete mode 100644 tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.htm.ini diff --git a/Cargo.lock b/Cargo.lock index 047647d867da..9553a2bb23b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -289,7 +289,7 @@ dependencies = [ "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -303,7 +303,7 @@ dependencies = [ "ipc-channel 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -424,8 +424,8 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender 0.35.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender 0.36.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -460,7 +460,7 @@ dependencies = [ "servo_remutex 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -707,7 +707,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -993,7 +993,7 @@ dependencies = [ "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1072,7 +1072,7 @@ dependencies = [ "servo_url 0.0.1", "style_traits 0.0.1", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1390,7 +1390,7 @@ dependencies = [ "style_traits 0.0.1", "unicode-bidi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1430,7 +1430,7 @@ dependencies = [ "servo_geometry 0.0.1", "servo_url 0.0.1", "style 0.0.1", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1444,7 +1444,7 @@ dependencies = [ "profile_traits 0.0.1", "script_traits 0.0.1", "servo_url 0.0.1", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1521,8 +1521,8 @@ dependencies = [ "style 0.0.1", "style_traits 0.0.1", "webdriver_server 0.0.1", - "webrender 0.35.0 (git+https://github.com/servo/webrender)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender 0.36.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", ] @@ -1671,7 +1671,7 @@ dependencies = [ "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1715,7 +1715,7 @@ dependencies = [ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -1774,7 +1774,7 @@ dependencies = [ "servo_url 0.0.1", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2301,7 +2301,7 @@ dependencies = [ "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", "xml5ever 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2331,7 +2331,7 @@ dependencies = [ "selectors 0.18.0", "servo_url 0.0.1", "style 0.0.1", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] @@ -2376,7 +2376,7 @@ dependencies = [ "style_traits 0.0.1", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3167,8 +3167,8 @@ dependencies = [ [[package]] name = "webrender" -version = "0.35.0" -source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3" +version = "0.36.0" +source = "git+https://github.com/servo/webrender#6609c796d66c68920f8596ba7c8b50ffa1490069" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3190,13 +3190,13 @@ dependencies = [ "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", ] [[package]] name = "webrender_traits" -version = "0.35.0" -source = "git+https://github.com/servo/webrender#861fb7b5570d69de37d8a1f364f42f38c87cb2d3" +version = "0.36.0" +source = "git+https://github.com/servo/webrender#6609c796d66c68920f8596ba7c8b50ffa1490069" dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3222,7 +3222,7 @@ dependencies = [ "msg 0.0.1", "script_traits 0.0.1", "servo_config 0.0.1", - "webrender_traits 0.35.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.36.0 (git+https://github.com/servo/webrender)", "webvr_traits 0.0.1", ] @@ -3564,8 +3564,8 @@ dependencies = [ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18" -"checksum webrender 0.35.0 (git+https://github.com/servo/webrender)" = "" -"checksum webrender_traits 0.35.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender 0.36.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender_traits 0.36.0 (git+https://github.com/servo/webrender)" = "" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8" diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs index 92012d71cb73..723e33287024 100644 --- a/components/layout/webrender_helpers.rs +++ b/components/layout/webrender_helpers.rs @@ -416,7 +416,6 @@ impl WebRenderDisplayItemConverter for DisplayItem { builder.push_stacking_context(stacking_context.scroll_policy, stacking_context.bounds.to_rectf(), - stacking_context.z_index, transform, webrender_traits::TransformStyle::Flat, perspective, diff --git a/components/webvr/webvr_thread.rs b/components/webvr/webvr_thread.rs index 6d16a23b83a7..3f268ab3cbb0 100644 --- a/components/webvr/webvr_thread.rs +++ b/components/webvr/webvr_thread.rs @@ -12,6 +12,7 @@ use std::collections::{HashMap, HashSet}; use std::sync::mpsc; use std::sync::mpsc::{Receiver, Sender}; use webrender_traits; +use webrender_traits::DeviceIntSize; use webvr_traits::{WebVRMsg, WebVRResult}; use webvr_traits::webvr::*; @@ -329,7 +330,7 @@ impl WebVRCompositorHandler { impl webrender_traits::VRCompositorHandler for WebVRCompositorHandler { #[allow(unsafe_code)] - fn handle(&mut self, cmd: webrender_traits::VRCompositorCommand, texture_id: Option) { + fn handle(&mut self, cmd: webrender_traits::VRCompositorCommand, texture: Option<(u32, DeviceIntSize)>) { match cmd { webrender_traits::VRCompositorCommand::Create(compositor_id) => { self.create_compositor(compositor_id); @@ -347,12 +348,12 @@ impl webrender_traits::VRCompositorHandler for WebVRCompositorHandler { } webrender_traits::VRCompositorCommand::SubmitFrame(compositor_id, left_bounds, right_bounds) => { if let Some(compositor) = self.compositors.get(&compositor_id) { - if let Some(texture_id) = texture_id { + if let Some((texture_id, size)) = texture { let layer = VRLayer { texture_id: texture_id, left_bounds: left_bounds, right_bounds: right_bounds, - texture_size: None + texture_size: Some((size.width as u32, size.height as u32)) }; unsafe { (*compositor.0).submit_frame(&layer); diff --git a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-animation.htm.ini b/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-animation.htm.ini deleted file mode 100644 index ca8e8dbe08f1..000000000000 --- a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-animation.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[mix-blend-mode-animation.htm] - type: reftest - expected: FAIL diff --git a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.htm.ini b/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.htm.ini deleted file mode 100644 index 19049dffb5cc..000000000000 --- a/tests/wpt/metadata-css/compositing-1_dev/html/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.htm.ini +++ /dev/null @@ -1,3 +0,0 @@ -[mix-blend-mode-blended-element-overflow-hidden-and-border-radius.htm] - type: reftest - expected: FAIL