servo: Merge #16113 - Update WR (opaque rect optimization, stacking c…

…ontext culling) (from glennw:update-wr-opaque-opt); r=mrobinson Source-Repo: https://github.com/servo/servo Source-Revision: 3b79bc25825ea416298b1917e0bd409b7044f837
Brli · Mar 26, 2017 · f188e94 · f188e94
1 parent fa563b3
commit f188e94
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 32 deletions.
diff --git a/servo/Cargo.lock b/servo/Cargo.lock
diff --git a/servo/components/canvas/canvas_paint_thread.rs b/servo/components/canvas/canvas_paint_thread.rs
@@ -567,7 +567,8 @@ impl<'a> CanvasPaintThread<'a> {
                                                 offset: 0,
                                                 is_opaque: false,
                                             },
-                                            element.into());
+                                            element.into(),
+                                            None);
 
             let data = CanvasImageData {
                 image_key: self.webrender_image_key,

diff --git a/servo/components/canvas/webgl_paint_thread.rs b/servo/components/canvas/webgl_paint_thread.rs
@@ -261,7 +261,8 @@ impl WebGLPaintThread {
                                                offset: 0,
                                                is_opaque: false,
                                            },
-                                           pixels.clone());
+                                           pixels.clone(),
+                                           None);
 
                 let image_data = CanvasImageData {
                     image_key: image_key,

diff --git a/servo/components/layout/webrender_helpers.rs b/servo/components/layout/webrender_helpers.rs
@@ -404,10 +404,6 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                 let stacking_context = &item.stacking_context;
                 debug_assert!(stacking_context.context_type == StackingContextType::Real);
 
-                let clip = builder.new_clip_region(&stacking_context.overflow.to_rectf(),
-                                                   vec![],
-                                                   None);
-
                 let transform = stacking_context.transform.map(|transform| {
                     LayoutTransform::from_untyped(&transform).into()
                 });
@@ -417,7 +413,6 @@ impl WebRenderDisplayItemConverter for DisplayItem {
 
                 builder.push_stacking_context(stacking_context.scroll_policy,
                                               stacking_context.bounds.to_rectf(),
-                                              clip,
                                               stacking_context.z_index,
                                               transform,
                                               perspective,