Add SK_AVOID_SLOW_RASTER_PIPELINE_BLURS to help CPU raster perf
Bug: 394559755
Change-Id: I601d15bfe08fdac8f19efc53ccabd2b460f877f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6284562
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Etienne Bergeron <etienneb@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1424052}
diff --git a/ash/shelf/scrollable_shelf_view_pixeltest.cc b/ash/shelf/scrollable_shelf_view_pixeltest.cc
index 7a0cb788e..864120a1 100644
--- a/ash/shelf/scrollable_shelf_view_pixeltest.cc
+++ b/ash/shelf/scrollable_shelf_view_pixeltest.cc
@@ -42,7 +42,7 @@
TEST_P(ScrollableShelfViewPixelRTLTest, Basics) {
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
"overflow",
- /*revision_number=*/9, GetPrimaryShelf()->GetWindow()));
+ /*revision_number=*/10, GetPrimaryShelf()->GetWindow()));
ASSERT_TRUE(scrollable_shelf_view_->right_arrow());
const gfx::Point right_arrow_center =
@@ -53,19 +53,19 @@
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
"overflow_end",
- /*revision_number=*/9, GetPrimaryShelf()->GetWindow()));
+ /*revision_number=*/10, GetPrimaryShelf()->GetWindow()));
}
TEST_P(ScrollableShelfViewPixelRTLTest, LeftRightShelfAlignment) {
GetPrimaryShelf()->SetAlignment(ShelfAlignment::kLeft);
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
"left_shelf_alignment",
- /*revision_number=*/6, GetPrimaryShelf()->GetWindow()));
+ /*revision_number=*/7, GetPrimaryShelf()->GetWindow()));
GetPrimaryShelf()->SetAlignment(ShelfAlignment::kRight);
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
"right_shelf_alignment",
- /*revision_number=*/6, GetPrimaryShelf()->GetWindow()));
+ /*revision_number=*/7, GetPrimaryShelf()->GetWindow()));
}
class ScrollableShelfViewWithGuestModePixelTest
diff --git a/ash/shelf/shelf_layout_manager_pixeltest.cc b/ash/shelf/shelf_layout_manager_pixeltest.cc
index e130674..267612c 100644
--- a/ash/shelf/shelf_layout_manager_pixeltest.cc
+++ b/ash/shelf/shelf_layout_manager_pixeltest.cc
@@ -72,7 +72,7 @@
EXPECT_TRUE(GetPixelDiffer()->CompareUiComponentsOnPrimaryScreen(
"shelf_show_with_auto_hide",
- /*revision_number=*/13, shelf->GetWindow(), shelf->hotseat_widget()));
+ /*revision_number=*/14, shelf->GetWindow(), shelf->hotseat_widget()));
}
} // namespace ash
diff --git a/chrome/browser/web_applications/os_integration/mac/icon_utils_unittest.mm b/chrome/browser/web_applications/os_integration/mac/icon_utils_unittest.mm
index e30fc9b6..f391584e 100644
--- a/chrome/browser/web_applications/os_integration/mac/icon_utils_unittest.mm
+++ b/chrome/browser/web_applications/os_integration/mac/icon_utils_unittest.mm
@@ -53,7 +53,7 @@
ASSERT_TRUE(!actual_masked_icon.IsEmpty());
ASSERT_TRUE(gfx::test::AreImagesClose(actual_masked_icon,
expected_masked_icon,
- /*max_deviation=*/5));
+ /*max_deviation=*/20));
}
TEST(IconUtilsTests, MaskNormalDiyAppIcon) {
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 95c26c01..a62885b 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -237,6 +237,8 @@
#define SK_LEGACY_INITWITHPREV_LAYER_SIZING
+#define SK_AVOID_SLOW_RASTER_PIPELINE_BLURS
+
///////////////////////// Imported from BUILD.gn and skia_common.gypi
/* In some places Skia can use static initializers for global initialization,
diff --git a/third_party/blink/web_tests/flag-specific/highdpi/svg/filters/feGaussianBlur-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/svg/filters/feGaussianBlur-expected.png
index dae06ce..e84189b 100644
--- a/third_party/blink/web_tests/flag-specific/highdpi/svg/filters/feGaussianBlur-expected.png
+++ b/third_party/blink/web_tests/flag-specific/highdpi/svg/filters/feGaussianBlur-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-expected.png b/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-expected.png
new file mode 100644
index 0000000..e2cb97c
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-parents-expected.png b/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-parents-expected.png
new file mode 100644
index 0000000..01a9afb3
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-parents-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-self-expected.png b/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-self-expected.png
new file mode 100644
index 0000000..e0cf656d
--- /dev/null
+++ b/third_party/blink/web_tests/flag-specific/skia-vulkan-swiftshader/css3/filters/blur-filter-page-scroll-self-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-expected.png b/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-expected.png
index e2cb97c..4f11c95c4e 100644
--- a/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-expected.png
+++ b/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-parents-expected.png b/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-parents-expected.png
index 01a9afb3..bd25f9b0 100644
--- a/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-parents-expected.png
+++ b/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-parents-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-self-expected.png b/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-self-expected.png
index e0cf656d..cf2deab 100644
--- a/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-self-expected.png
+++ b/third_party/blink/web_tests/platform/linux/css3/filters/blur-filter-page-scroll-self-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/ietestcenter/css3/text/textshadow-002-expected.png b/third_party/blink/web_tests/platform/linux/ietestcenter/css3/text/textshadow-002-expected.png
index 6cc36fb..ac1bddcb 100644
--- a/third_party/blink/web_tests/platform/linux/ietestcenter/css3/text/textshadow-002-expected.png
+++ b/third_party/blink/web_tests/platform/linux/ietestcenter/css3/text/textshadow-002-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/linux/paint/invalidation/shadow-multiple-expected.png
index caaa863..5f2ecd6 100644
--- a/third_party/blink/web_tests/platform/linux/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/linux/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/svg/filters/filter-on-filter-for-text-expected.png b/third_party/blink/web_tests/platform/linux/svg/filters/filter-on-filter-for-text-expected.png
index a9d8d861..3b5e0fa 100644
--- a/third_party/blink/web_tests/platform/linux/svg/filters/filter-on-filter-for-text-expected.png
+++ b/third_party/blink/web_tests/platform/linux/svg/filters/filter-on-filter-for-text-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/shadow-multiple-expected.png
index 1a74a9a..309d8fd 100644
--- a/third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac11-arm64/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/shadow-multiple-expected.png
index 1a74a9a..309d8fd 100644
--- a/third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac12-arm64/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/shadow-multiple-expected.png
index 1a74a9a..309d8fd 100644
--- a/third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac13-arm64/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac14-arm64/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/mac-mac14-arm64/paint/invalidation/shadow-multiple-expected.png
index 1a74a9a..309d8fd 100644
--- a/third_party/blink/web_tests/platform/mac-mac14-arm64/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac14-arm64/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac15-arm64/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/mac-mac15-arm64/paint/invalidation/shadow-multiple-expected.png
index 1a74a9a..309d8fd 100644
--- a/third_party/blink/web_tests/platform/mac-mac15-arm64/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/mac-mac15-arm64/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-expected.png
index 1048431..bd95bf20 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-parents-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-parents-expected.png
index 56e1817..22303bf 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-parents-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-parents-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-self-expected.png b/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-self-expected.png
index 8eb9bce0..dd2a8a3 100644
--- a/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-self-expected.png
+++ b/third_party/blink/web_tests/platform/mac/css3/filters/blur-filter-page-scroll-self-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/ietestcenter/css3/text/textshadow-002-expected.png b/third_party/blink/web_tests/platform/mac/ietestcenter/css3/text/textshadow-002-expected.png
index 846596f..69442ad8 100644
--- a/third_party/blink/web_tests/platform/mac/ietestcenter/css3/text/textshadow-002-expected.png
+++ b/third_party/blink/web_tests/platform/mac/ietestcenter/css3/text/textshadow-002-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/mac/paint/invalidation/shadow-multiple-expected.png
index afed4a3..f89f764 100644
--- a/third_party/blink/web_tests/platform/mac/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/mac/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/svg/filters/filter-on-filter-for-text-expected.png b/third_party/blink/web_tests/platform/mac/svg/filters/filter-on-filter-for-text-expected.png
index 20957cd..d2e3513 100644
--- a/third_party/blink/web_tests/platform/mac/svg/filters/filter-on-filter-for-text-expected.png
+++ b/third_party/blink/web_tests/platform/mac/svg/filters/filter-on-filter-for-text-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-expected.png b/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-expected.png
index d967bc2..2a0c690a 100644
--- a/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-expected.png
+++ b/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-parents-expected.png b/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-parents-expected.png
index 33a748a..85d5ee5 100644
--- a/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-parents-expected.png
+++ b/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-parents-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-self-expected.png b/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-self-expected.png
index 790c92f..1b09552 100644
--- a/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-self-expected.png
+++ b/third_party/blink/web_tests/platform/win/css3/filters/blur-filter-page-scroll-self-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/ietestcenter/css3/text/textshadow-002-expected.png b/third_party/blink/web_tests/platform/win/ietestcenter/css3/text/textshadow-002-expected.png
index 0a81ac4..798621a4 100644
--- a/third_party/blink/web_tests/platform/win/ietestcenter/css3/text/textshadow-002-expected.png
+++ b/third_party/blink/web_tests/platform/win/ietestcenter/css3/text/textshadow-002-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/win/paint/invalidation/shadow-multiple-expected.png
index f182e2e7..bf807ff4 100644
--- a/third_party/blink/web_tests/platform/win/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/win/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/svg/filters/filter-on-filter-for-text-expected.png b/third_party/blink/web_tests/platform/win/svg/filters/filter-on-filter-for-text-expected.png
index 1b761c1..856d504 100644
--- a/third_party/blink/web_tests/platform/win/svg/filters/filter-on-filter-for-text-expected.png
+++ b/third_party/blink/web_tests/platform/win/svg/filters/filter-on-filter-for-text-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-expected.png b/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-expected.png
index e2cb97c..4f11c95c4e 100644
--- a/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-expected.png
+++ b/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-parents-expected.png b/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-parents-expected.png
index 01a9afb3..bd25f9b0 100644
--- a/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-parents-expected.png
+++ b/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-parents-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-self-expected.png b/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-self-expected.png
index e0cf656d..cf2deab 100644
--- a/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-self-expected.png
+++ b/third_party/blink/web_tests/platform/win10/css3/filters/blur-filter-page-scroll-self-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win11-arm64/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/platform/win11-arm64/paint/invalidation/shadow-multiple-expected.png
index da9376a7..f57daef2 100644
--- a/third_party/blink/web_tests/platform/win11-arm64/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/blink/web_tests/platform/win11-arm64/paint/invalidation/shadow-multiple-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/svg/filters/feDropShadow-zero-deviation-expected.png b/third_party/blink/web_tests/svg/filters/feDropShadow-zero-deviation-expected.png
index 7783f1c..4a5d2e4 100644
--- a/third_party/blink/web_tests/svg/filters/feDropShadow-zero-deviation-expected.png
+++ b/third_party/blink/web_tests/svg/filters/feDropShadow-zero-deviation-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/svg/filters/feGaussianBlur-expected.png b/third_party/blink/web_tests/svg/filters/feGaussianBlur-expected.png
index 51f5758..122a8ca 100644
--- a/third_party/blink/web_tests/svg/filters/feGaussianBlur-expected.png
+++ b/third_party/blink/web_tests/svg/filters/feGaussianBlur-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/svg/filters/feGaussianBlur-zero-deviation-expected.png b/third_party/blink/web_tests/svg/filters/feGaussianBlur-zero-deviation-expected.png
index 843118d7..8543764 100644
--- a/third_party/blink/web_tests/svg/filters/feGaussianBlur-zero-deviation-expected.png
+++ b/third_party/blink/web_tests/svg/filters/feGaussianBlur-zero-deviation-expected.png
Binary files differ
