Bug 1506400 - Update webrender to commit 429cb0eb56d6208a47f83b2efb828bf5db54d777 (WR PR #3297). r=kats

Differential Revision: https://phabricator.services.mozilla.com/D11595

--HG--
extra : moz-landing-system : lando

gfx/webrender/src/picture.rs

@@ -396,7 +396,7 @@ pub struct PicturePrimitive {
 
     /// The spatial node index of this picture when it is
     /// composited into the parent picture.
-    pub spatial_node_index: SpatialNodeIndex,
+    spatial_node_index: SpatialNodeIndex,
 
     /// The local rect of this picture. It is built
     /// dynamically during the first picture traversal.
@@ -633,29 +633,31 @@ impl PicturePrimitive {
     pub fn add_split_plane(
         splitter: &mut PlaneSplitter,
         transforms: &TransformPalette,
-        local_rect: LayoutRect,
-        spatial_node_index: SpatialNodeIndex,
+        prim_instance: &PrimitiveInstance,
+        original_local_rect: LayoutRect,
         plane_split_anchor: usize,
-        world_bounds: WorldRect,
     ) -> bool {
-        // If the picture isn't visible, then ensure it's not added
-        // to the plane splitter, to avoid assertions during batching
-        // about each split plane having a surface.
-        if local_rect.size.width <= 0.0 ||
-           local_rect.size.height <= 0.0 {
-            return false;
-        }
-
         let transform = transforms
-            .get_world_transform(spatial_node_index);
+            .get_world_transform(prim_instance.spatial_node_index);
         let matrix = transform.cast();
-        let local_rect = local_rect.cast();
-        let world_bounds = world_bounds.cast();
+
+        // Apply the local clip rect here, before splitting. This is
+        // because the local clip rect can't be applied in the vertex
+        // shader for split composites, since we are drawing polygons
+        // rather that rectangles. The interpolation still works correctly
+        // since we determine the UVs by doing a bilerp with a factor
+        // from the original local rect.
+        let local_rect = match original_local_rect
+            .intersection(&prim_instance.combined_local_clip_rect)
+        {
+            Some(rect) => rect.cast(),
+            None => return false,
+        };
 
         match transform.transform_kind() {
             TransformedRectKind::AxisAligned => {
                 let inv_transform = transforms
-                    .get_world_inv_transform(spatial_node_index);
+                    .get_world_inv_transform(prim_instance.spatial_node_index);
                 let polygon = Polygon::from_transformed_rect_with_inverse(
                     local_rect,
                     &matrix,
@@ -672,7 +674,7 @@ impl PicturePrimitive {
                         plane_split_anchor,
                     ),
                     &matrix,
-                    Some(world_bounds),
+                    prim_instance.clipped_world_rect.map(|r| r.to_f64()),
                 );
                 if let Ok(results) = results {
                     for poly in results {

gfx/webrender/src/prim_store.rs

@@ -2341,10 +2341,9 @@ impl PrimitiveStore {
                         PicturePrimitive::add_split_plane(
                             splitter,
                             frame_state.transforms,
+                            prim_instance,
                             prim_local_rect,
-                            pic.spatial_node_index,
                             plane_split_anchor,
-                            frame_context.world_rect,
                         );
                     }
                 } else {

gfx/webrender_bindings/revision.txt

@@ -1 +1 @@
-1adb3528be81e583b2b0593c31f6b2a64b8b1735
+429cb0eb56d6208a47f83b2efb828bf5db54d777