stroke-dasharray applied to markers and cannot be overriden by ="0"

Ahmad-S792 · Ahmad Saleem · commit c948de8983c3 · 2026-01-01T09:45:54.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=192539 rdar://46607685 Reviewed by Nikolas Zimmermann. This patch aligns WebKit with Gecko / Firefox and Blink / Chromium. Further, this fixes issue for both LegacySVG and Layer Based SVG Engine (LBSE). SVG markers were inheriting stroke-dasharray from their parent elements, causing dashed strokes to appear on marker content even when explicitly set to "0" or "none". This occurred because the marker rendering context was not properly resetting the dash array state before painting. The original issue is stroke-dasharray should not propagate into marker content unless explicitly set on elements within the marker definition. This change ensures that when rendering markers, we reset the stroke dash array to empty before painting marker content, allowing marker- specific stroke-dasharray values (including "0") to be applied correctly without inheriting from the parent path or shape. * Source/WebCore/rendering/svg/RenderSVGPath.cpp: (WebCore::RenderSVGPath::drawMarkers): * Source/WebCore/rendering/svg/legacy/LegacyRenderSVGPath.cpp: (WebCore::LegacyRenderSVGPath::drawMarkers): * LayoutTests/svg/custom/marker-stroke-dasharray-none-zero.svg: Added. * LayoutTests/svg/custom/marker-stroke-dasharray-none-zero-expected.svg: Added. (Added fuzziness in test due to Skia vs CG + known issue in CG of corner missing - which was leading to difference) Canonical link: https://commits.webkit.org/305042@main
diff --git a/LayoutTests/svg/custom/marker-stroke-dasharray-none-zero-expected.svg b/LayoutTests/svg/custom/marker-stroke-dasharray-none-zero-expected.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" overflow="visible">
+  <defs>
+    <marker id="my-marker-workaround" orient="auto" stroke-dasharray="1,0" overflow="visible" markerUnits="userSpaceOnUse" >
+      <path stroke="black" fill="white" d="M 0 -5 -10 0 0 5 z"></path>
+    </marker>
+  </defs>
+
+  <g transform="scale(2,2)">
+    <path d="M 50 20 200 20" stroke="black" stroke-width="2" stroke-dasharray="5,5" marker-start="url(#my-marker-workaround)" />
+  </g>
+</svg>
diff --git a/LayoutTests/svg/custom/marker-stroke-dasharray-none-zero.svg b/LayoutTests/svg/custom/marker-stroke-dasharray-none-zero.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" overflow="visible">
+<meta name="fuzzy" content="maxDifference=44-255; totalPixels=2-121" />
+  <defs>
+    <marker id="my-marker" orient="auto" overflow="visible" markerUnits="userSpaceOnUse" >
+      <path stroke="black" fill="white" d="M 0 -5 -10 0 0 5 z"></path>
+    </marker>
+  </defs>
+
+  <g transform="scale(2,2)">
+    <path d="M 50 20 200 20" stroke="black" stroke-width="2" stroke-dasharray="5,5" marker-start="url(#my-marker)" />
+  </g>
+</svg>
diff --git a/Source/WebCore/rendering/svg/RenderSVGPath.cpp b/Source/WebCore/rendering/svg/RenderSVGPath.cpp
@@ -234,6 +234,7 @@ void RenderSVGPath::drawMarkers(PaintInfo& paintInfo)
             auto& context = paintInfo.context();
             GraphicsContextStateSaver stateSaver(context);
 
+            context.setLineDash(DashArray(), 0);
             auto contentTransform = marker->markerTransformation(markerPosition.origin, markerPosition.angle, strokeWidth);
             marker->checkedLayer()->paintSVGResourceLayer(context, contentTransform);
         }
diff --git a/Source/WebCore/rendering/svg/legacy/LegacyRenderSVGPath.cpp b/Source/WebCore/rendering/svg/legacy/LegacyRenderSVGPath.cpp
@@ -253,8 +253,13 @@ void LegacyRenderSVGPath::drawMarkers(PaintInfo& paintInfo)
     float strokeWidth = this->strokeWidth();
     unsigned size = m_markerPositions.size();
     for (unsigned i = 0; i < size; ++i) {
-        if (auto* marker = markerForType(m_markerPositions[i].type, markerStart, markerMid, markerEnd))
+        if (auto* marker = markerForType(m_markerPositions[i].type, markerStart, markerMid, markerEnd)) {
+            auto& context = paintInfo.context();
+            GraphicsContextStateSaver stateSaver(context);
+
+            context.setLineDash(DashArray(), 0);
             marker->draw(paintInfo, marker->markerTransformation(m_markerPositions[i].origin, m_markerPositions[i].angle, strokeWidth));
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,7 @@ void RenderSVGPath::drawMarkers(PaintInfo& paintInfo)`
`234`	`234`	`auto& context = paintInfo.context();`
`235`	`235`	`GraphicsContextStateSaver stateSaver(context);`
`236`	`236`
	`237`	`+ context.setLineDash(DashArray(), 0);`
`237`	`238`	`auto contentTransform = marker->markerTransformation(markerPosition.origin, markerPosition.angle, strokeWidth);`
`238`	`239`	`marker->checkedLayer()->paintSVGResourceLayer(context, contentTransform);`
`239`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,13 @@ void LegacyRenderSVGPath::drawMarkers(PaintInfo& paintInfo)`
`253`	`253`	`float strokeWidth = this->strokeWidth();`
`254`	`254`	`unsigned size = m_markerPositions.size();`
`255`	`255`	`for (unsigned i = 0; i < size; ++i) {`
`256`		`- if (auto* marker = markerForType(m_markerPositions[i].type, markerStart, markerMid, markerEnd))`
	`256`	`+ if (auto* marker = markerForType(m_markerPositions[i].type, markerStart, markerMid, markerEnd)) {`
	`257`	`+ auto& context = paintInfo.context();`
	`258`	`+ GraphicsContextStateSaver stateSaver(context);`
	`259`	`+`
	`260`	`+ context.setLineDash(DashArray(), 0);`
`257`	`261`	`marker->draw(paintInfo, marker->markerTransformation(m_markerPositions[i].origin, m_markerPositions[i].angle, strokeWidth));`
	`262`	`+ }`
`258`	`263`	`}`
`259`	`264`	`}`
`260`	`265`