[Filters] Disable CoreGraphics blur and drop-shadow filters

shallawa · Said Abou-Hallawa · commit 8428c6de6700 · 2026-01-07T09:35:51.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=305034 rdar://166631624 The CoreGraphics filters will be turned off until system frameworks bugs are fixed. Also the workaround which was added in 299903@main will be reverted. Reviewed by Simon Fraser. * LayoutTests/fast/filter-image/clipped-filter-expected.html: * LayoutTests/fast/filter-image/clipped-filter.html: * LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur.html: * LayoutTests/platform/mac-wk2/TestExpectations: * Source/WebCore/platform/graphics/filters/FEDropShadow.cpp: (WebCore::FEDropShadow::supportedFilterRenderingModes const): * Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp: (WebCore::FEGaussianBlur::supportedFilterRenderingModes const): (WebCore::FEGaussianBlur::createGraphicsStyle const): Canonical link: https://commits.webkit.org/305216@main
diff --git a/LayoutTests/fast/filter-image/clipped-filter-expected.html b/LayoutTests/fast/filter-image/clipped-filter-expected.html
@@ -43,7 +43,7 @@
 <svg>
     <defs>
         <clipPath id="clipPath">
-            <path d="M18,38 v200 h90 a150,150 0 0,1 300,0 h50 v-200 z"
+            <path d="M18,38 v200 h90 a150,150 0 0,1 300,0 h50 v-200 z">
         </clipPath>
     </defs>
 </svg>
diff --git a/LayoutTests/fast/filter-image/clipped-filter.html b/LayoutTests/fast/filter-image/clipped-filter.html
@@ -2,7 +2,7 @@
 
 <html>
 <head>
-    <meta name="fuzzy" content="maxDifference=0-5; totalPixels=0-5" />
+    <meta name="fuzzy" content="maxDifference=0-75; totalPixels=0-132" />
     <style>
         .circle {
             width: 300px;
diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur.html b/LayoutTests/imported/w3c/web-platform-tests/html/canvas/element/manual/filters/canvas-filter-shadow-and-properties-blur.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <link rel="match" href="canvas-filter-shadow-and-properties-blur-expected.html"/>
-<meta name="fuzzy" content="maxDifference=0-13; totalPixels=0-25600">
+<meta name="fuzzy" content="maxDifference=0-35; totalPixels=0-25600">
 <body>
   <canvas id="canvas" width="300" height="300"></canvas>
 </body>
diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -2385,8 +2385,6 @@ webkit.org/b/299830 imported/w3c/web-platform-tests/storage-access-api/hasStorag
 
 webkit.org/b/299826 [ Release x86_64 ] media/modern-media-controls/media-controller/media-controller-click-on-video-background-should-pause.html [ Crash ]
 
-webkit.org/b/300864 imported/w3c/web-platform-tests/css/css-viewport/zoom/filters-drop-shadow.html [ Pass ImageOnlyFailure ]
-
 webkit.org/b/301153 [ Debug ] fast/parser/entity-comment-in-textarea.html [ Pass Timeout ]
 
 webkit.org/b/301566 [ Debug ] imported/w3c/web-platform-tests/custom-elements/registries/Element-innerHTML.html [ Skip ]
diff --git a/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp b/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp
@@ -147,7 +147,7 @@ OptionSet<FilterRenderingMode> FEDropShadow::supportedFilterRenderingModes(Optio
 #if (USE(CORE_IMAGE)) || (USE(SKIA))
     modes.add(FilterRenderingMode::Accelerated);
 #endif
-#if USE(CG)
+#if USE(CG) && HAVE(FIX_FOR_RADAR_163968203)
     if (m_stdX == m_stdY)
         modes.add(FilterRenderingMode::GraphicsContext);
 #endif
diff --git a/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp b/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp
@@ -168,7 +168,7 @@ OptionSet<FilterRenderingMode> FEGaussianBlur::supportedFilterRenderingModes(Opt
         modes.add(FilterRenderingMode::Accelerated);
 #endif
     // FIXME: Ensure the correctness of the CG GaussianBlur filter (http://webkit.org/b/243816).
-#if HAVE(CGSTYLE_COLORMATRIX_BLUR)
+#if HAVE(CGSTYLE_COLORMATRIX_BLUR) && HAVE(FIX_FOR_RADAR_163968203) && HAVE(FIX_FOR_RADAR_160309842)
     if (m_stdX == m_stdY && preferredFilterRenderingModes.contains(FilterRenderingMode::GraphicsContext))
         modes.add(FilterRenderingMode::GraphicsContext);
 #endif
@@ -195,16 +195,8 @@ std::unique_ptr<FilterEffectApplier> FEGaussianBlur::createSoftwareApplier() con
     return FilterEffectApplier::create<FEGaussianBlurSoftwareApplier>(*this);
 }
 
-std::optional<GraphicsStyle> FEGaussianBlur::createGraphicsStyle(GraphicsContext& context, const Filter& filter) const
+std::optional<GraphicsStyle> FEGaussianBlur::createGraphicsStyle(GraphicsContext&, const Filter& filter) const
 {
-#if PLATFORM(COCOA) && !HAVE(FIX_FOR_RADAR_160309842)
-    if (context.renderingMode() == RenderingMode::Accelerated) {
-        auto radius = calculateKernelSize(filter, { m_stdX, m_stdY });
-        return GraphicsGaussianBlur { radius };
-    }
-#else
-    UNUSED_PARAM(context);
-#endif
     auto radius = calculateUnscaledKernelSize(filter.resolvedSize({ m_stdX, m_stdY }));
     return GraphicsGaussianBlur { radius };
 }
