Update WR (new groove/ridge border path, mix-blend-mode optimizations)

A few other minor additions too.
servo · Apr 26, 2017 · c879584 · c879584
1 parent dc594fa
commit c879584
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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<u32>) {
+    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
diff --git a/...iting-1_dev/html/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.htm.ini b/...iting-1_dev/html/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.htm.ini