From c385b3c9737c17d59cb02e520c3b68b232cb6497 Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Thu, 14 Sep 2023 15:00:42 +0530 Subject: Revert "Upgrade WebRender to e491e1ae637b2eed1e7195855d88357e5eb3ddf9 (#30323)" This reverts commit a9d37cb85ac2c55fc630fccffe1ba60ff00f555b. --- .../wrench/reftests/mask/checkerboard.png | Bin 4958 -> 11433 bytes .../webrender/wrench/reftests/mask/circle.png | Bin 4928 -> 0 bytes .../wrench/reftests/mask/mask-perspective.png | Bin 279 -> 311 bytes .../webrender/wrench/reftests/mask/reftest.list | 9 +++---- .../wrench/reftests/mask/rounded-corners.png | Bin 1697 -> 1720 bytes .../reftests/mask/scaled-filter-raster-root.png | Bin 5314 -> 0 bytes .../reftests/mask/scaled-filter-raster-root.yaml | 27 --------------------- 7 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 third_party/webrender/wrench/reftests/mask/circle.png delete mode 100644 third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.png delete mode 100644 third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.yaml (limited to 'third_party/webrender/wrench/reftests/mask') diff --git a/third_party/webrender/wrench/reftests/mask/checkerboard.png b/third_party/webrender/wrench/reftests/mask/checkerboard.png index f2c45c31940..e8a05df95be 100644 Binary files a/third_party/webrender/wrench/reftests/mask/checkerboard.png and b/third_party/webrender/wrench/reftests/mask/checkerboard.png differ diff --git a/third_party/webrender/wrench/reftests/mask/circle.png b/third_party/webrender/wrench/reftests/mask/circle.png deleted file mode 100644 index ea5789e44f6..00000000000 Binary files a/third_party/webrender/wrench/reftests/mask/circle.png and /dev/null differ diff --git a/third_party/webrender/wrench/reftests/mask/mask-perspective.png b/third_party/webrender/wrench/reftests/mask/mask-perspective.png index 425872c2900..02c0cc93ba3 100644 Binary files a/third_party/webrender/wrench/reftests/mask/mask-perspective.png and b/third_party/webrender/wrench/reftests/mask/mask-perspective.png differ diff --git a/third_party/webrender/wrench/reftests/mask/reftest.list b/third_party/webrender/wrench/reftests/mask/reftest.list index 8119f4a830d..7a18b4a0108 100644 --- a/third_party/webrender/wrench/reftests/mask/reftest.list +++ b/third_party/webrender/wrench/reftests/mask/reftest.list @@ -1,6 +1,6 @@ -fuzzy(1,10) == mask.yaml mask-ref.yaml -fuzzy(1,10) == mask-tiling.yaml mask-ref.yaml -fuzzy(1,10) == nested-mask.yaml nested-mask-ref.yaml +== mask.yaml mask-ref.yaml +== mask-tiling.yaml mask-ref.yaml +== nested-mask.yaml nested-mask-ref.yaml == nested-mask-tiling.yaml nested-mask-ref.yaml != mask.yaml green.yaml == aligned-layer-rect.yaml aligned-layer-rect-ref.yaml @@ -12,6 +12,5 @@ platform(linux,mac) fuzzy(1,17500) == mask-atomicity-tiling.yaml mask-atomicity- platform(linux,mac) == mask-perspective.yaml mask-perspective.png == fuzzy(1,11) mask-perspective-tiling.yaml mask-perspective.yaml platform(linux,mac) == checkerboard.yaml checkerboard.png -skip_on(android,device) fuzzy(2,1900) == checkerboard.yaml checkerboard-tiling.yaml # Fails on a Pixel2 +skip_on(android,device) == checkerboard.yaml checkerboard-tiling.yaml # Fails on a Pixel2 == missing-mask.yaml missing-mask-ref.yaml -platform(linux) == scaled-filter-raster-root.yaml scaled-filter-raster-root.png diff --git a/third_party/webrender/wrench/reftests/mask/rounded-corners.png b/third_party/webrender/wrench/reftests/mask/rounded-corners.png index 4f8d1d0fa02..19adfe02ec8 100644 Binary files a/third_party/webrender/wrench/reftests/mask/rounded-corners.png and b/third_party/webrender/wrench/reftests/mask/rounded-corners.png differ diff --git a/third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.png b/third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.png deleted file mode 100644 index e9cf49553ed..00000000000 Binary files a/third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.png and /dev/null differ diff --git a/third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.yaml b/third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.yaml deleted file mode 100644 index b4e9d8574b2..00000000000 --- a/third_party/webrender/wrench/reftests/mask/scaled-filter-raster-root.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# Verify that a tiled clip mask is correctly applied to a surface that -# is both a raster root and has a device-pixel ratio different than the -# primary surface (due to the scale transform). ---- -root: - items: - - type: stacking-context - transform-origin: [0, 0] - transform: scale(20) - items: - - type: clip - bounds: [10, 10, 10, 10] - id: 2 - image-mask: - image: "circle.png" - rect: [10, 10, 10, 10] - repeat: false - tile-size: 200 - - type: stacking-context - filters: [opacity(0.5)] - items: - - type: stacking-context - clip-node: 2 - items: - - type: rect - bounds: [10, 10, 10, 10] - color: blue -- cgit v1.2.3