An SVG element with a CSS reference filter fails to repaint when the …

…filter changes https://bugs.webkit.org/show_bug.cgi?id=263229 rdar://117047658 Reviewed by Nikolas Zimmermann. If an SVG element has a CSS filter which references an SVG element (which may be a child of that SVG, or some other SVG in the document), then we fail to repaint the SVG when the filter changes. This is a followup to 267236@main, removing the `&& !renderer().isSVGRootOrLegacySVGRoot()` check in `RenderLayer::updateFiltersAfterStyleChange()`, since in this configuration we do need to have the RenderLayer track the filter dependencies. * LayoutTests/svg/filters/css-repaint-reference-filter-on-root-expected.txt: Added. * LayoutTests/svg/filters/css-repaint-reference-filter-on-root.html: Added. * Source/WebCore/rendering/RenderLayer.cpp: (WebCore::RenderLayer::updateFiltersAfterStyleChange): Canonical link: https://commits.webkit.org/269413@main
WebKit · Oct 17, 2023 · ea2c363 · ea2c363
1 parent afe960e
commit ea2c363
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/LayoutTests/svg/filters/css-repaint-reference-filter-on-root-expected.txt b/LayoutTests/svg/filters/css-repaint-reference-filter-on-root-expected.txt
@@ -0,0 +1,4 @@
+(repaint rects
+  (rect 49 313 100 111)
+)
+
diff --git a/LayoutTests/svg/filters/css-repaint-reference-filter-on-root.html b/LayoutTests/svg/filters/css-repaint-reference-filter-on-root.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style>
+        svg {
+            display: block;
+            margin: 20px;
+            height: 200px;
+        }
+
+        .container {
+            padding: 10px;
+            width: 300px;
+            margin: 10px;
+            border: 1px solid black;
+        }
+    </style>
+    <script src="../../fast/repaint/resources/text-based-repaint.js"></script>
+    <script>
+        function repaintTest()
+        {
+            let filter = document.getElementById('targetFilter');
+            filter.querySelector('feColorMatrix').setAttribute('values', '90')
+        }
+
+        window.addEventListener('load', () => {
+            runRepaintTest();
+        }, false);
+    </script>
+</head>
+<body>
+    <div class="container">
+        <svg id="gammaTarget1" width="100" height="100">
+            <filter id="targetFilter">
+              <feColorMatrix type="hueRotate" values="180" />
+            </filter>
+            <rect width="100" height="100" fill="red" filter="url(#targetFilter)"/>
+        </svg>
+    </div>
+    <div class="container">
+        <svg width="100" height="100" style="filter: url(#targetFilter);">
+            <rect width="100" height="100" fill="red"/>
+        </svg>
+    </div>
+</body>
+</html>
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
@@ -5623,9 +5623,7 @@ void RenderLayer::updateFiltersAfterStyleChange(StyleDifference diff, const Rend
         return;
     }
 
-    // Add the filter as a client to this renderer, unless we are a RenderLayer accommodating
-    // an SVG. In that case it takes care of its own resource management for filters.
-    if (renderer().style().filter().hasReferenceFilter() && !renderer().isSVGRootOrLegacySVGRoot()) {
+    if (renderer().style().filter().hasReferenceFilter()) {
         ensureLayerFilters();
         m_filters->updateReferenceFilterClients(renderer().style().filter());
     } else if (m_filters)