[LegacySVG] Don't check 'visibility' in LegacyRenderSVGResourceMasker

Ahmad-S792 · Ahmad Saleem · commit bda153efaee1 · 2026-01-02T08:26:16.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=297045 rdar://157729389 Reviewed by Nikolas Zimmermann. This patch aligns WebKit with Gecko / Firefox and Blink / Chromium. Note, this bug does not exist in Layer Based SVG engine (LBSE). Merge: https://chromium.googlesource.com/chromium/src/+/51a75fa55ba71462963ddcf085995cf3eca66104 Since 'visibility' does not work in the same way as 'display', it's not possible to "prune" subtrees based on non-'visible' values of the property. Remove the check from the two methods that use it, and leave to lower levels to handle it. * Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMasker.cpp: (WebCore::LegacyRenderSVGResourceMasker::drawContentIntoContext): (WebCore::LegacyRenderSVGResourceMasker::calculateMaskContentRepaintRect): * LayoutTests/svg/masking/mask-with-visibility-hidden-group-expected.html: Added. * LayoutTests/svg/masking/mask-with-visibility-hidden-group.html: Added. Canonical link: https://commits.webkit.org/305047@main
diff --git a/LayoutTests/svg/masking/mask-with-visibility-hidden-group-expected.html b/LayoutTests/svg/masking/mask-with-visibility-hidden-group-expected.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; background-color: green"></div>
diff --git a/LayoutTests/svg/masking/mask-with-visibility-hidden-group.html b/LayoutTests/svg/masking/mask-with-visibility-hidden-group.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<svg>
+  <mask id="m">
+    <g visibility="hidden">
+      <rect width="100" height="100" fill="white" visibility="visible"/>
+      <rect width="200" height="100" fill="white"/>
+    </g>
+  </mask>
+  <rect width="200" height="100" fill="green" mask="url(#m)"/>
+</svg>
diff --git a/Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMasker.cpp b/Source/WebCore/rendering/svg/legacy/LegacyRenderSVGResourceMasker.cpp
@@ -145,7 +145,7 @@ bool LegacyRenderSVGResourceMasker::drawContentIntoContext(GraphicsContext& cont
         if (renderer->needsLayout())
             return false;
         const CheckedRef style = renderer->style();
-        if (style->display() == DisplayType::None || style->usedVisibility() != Visibility::Visible)
+        if (style->display() == DisplayType::None)
             continue;
         SVGRenderingContext::renderSubtreeToContext(context, *renderer, maskContentTransformation);
     }
@@ -176,7 +176,7 @@ void LegacyRenderSVGResourceMasker::calculateMaskContentRepaintRect(RepaintRectC
         if (!renderer || !childNode->isSVGElement())
             continue;
         const CheckedRef style = renderer->style();
-        if (style->display() == DisplayType::None || style->usedVisibility() != Visibility::Visible)
+        if (style->display() == DisplayType::None)
              continue;
         m_maskContentBoundaries[repaintRectCalculation].unite(renderer->localToParentTransform().mapRect(renderer->repaintRectInLocalCoordinates(repaintRectCalculation)));
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<!DOCTYPE html>`
	`2`	`+<div style="width: 100px; height: 100px; background-color: green"></div>`