Backed out changeset 2c50d92db013 (bug 1631687) for reftests failures on default-subregion.svg and mix-blend-mode-and-filter.svg CLOSED TREE

gfx/wr/webrender/src/prim_store/mod.rs

@@ -2105,7 +2105,15 @@ impl PrimitiveStore {
                         continue;
                     }
 
-                    let local_rect = match prim_shadowed_rect.intersection(&prim_instance.local_clip_rect) {
+                    // Inflate the local rect for this primitive by the inflation factor of
+                    // the picture context and include the shadow offset. This ensures that
+                    // even if the primitive itself is not visible, any effects from the
+                    // blur radius or shadow will be correctly taken into account.
+                    let inflation_factor = surface.inflation_factor;
+                    let local_rect = prim_shadowed_rect
+                        .inflate(inflation_factor, inflation_factor)
+                        .intersection(&prim_instance.local_clip_rect);
+                    let local_rect = match local_rect {
                         Some(local_rect) => local_rect,
                         None => {
                             if prim_instance.is_chased() {

gfx/wr/wrench/reftests/text/reftest.list

@@ -16,7 +16,7 @@ skip_on(android,device) fuzzy(1,3) == shadow.yaml shadow-ref.yaml  # Fails on Pi
 == decorations.yaml decorations-ref.yaml
 skip_on(android,device) fuzzy(1,3001) == decorations-suite.yaml decorations-suite.png  # Fails on Pixel2
 == 1658.yaml 1658-ref.yaml
-fuzzy(1,7) == split-batch.yaml split-batch-ref.yaml
+fuzzy(1,6) == split-batch.yaml split-batch-ref.yaml
 # Next 3 tests affected by bug 1548099 on Android
 skip_on(android) == shadow-red.yaml shadow-red-ref.yaml
 skip_on(android) fuzzy(1,735) == shadow-grey.yaml shadow-grey-ref.yaml

layout/reftests/svg/filters/svg-filter-chains/reftest.list

@@ -4,7 +4,7 @@
 == clip-input.svg clip-input-ref.svg
 == clip-original-SourceGraphic.svg clip-original-SourceGraphic-ref.svg
 == clip-output.svg clip-output-ref.svg
-fuzzy-if(webrender,3-5,17552-20160) == default-subregion.svg default-subregion-ref.svg
+fuzzy-if(webrender,3-5,17552-20155) == default-subregion.svg default-subregion-ref.svg
 == different-FillPaint-filter-regions.svg different-FillPaint-filter-regions-ref.svg
 == different-StrokePaint-filter-regions.svg different-StrokePaint-filter-regions-ref.svg
 == dont-clip-previous-primitives.svg dont-clip-previous-primitives-ref.svg