Bug 1883285 - ensure non-scaling-stroke animates when scaling starts from 0 r=emilio

longsonr · longsonr · commit 42bbfc3f8434 · 2024-06-02T06:42:45.000Z
Differential Revision: https://phabricator.services.mozilla.com/D212352
diff --git a/layout/svg/SVGUtils.cpp b/layout/svg/SVGUtils.cpp
@@ -1084,7 +1084,7 @@ bool SVGUtils::GetNonScalingStrokeTransform(const nsIFrame* aFrame,
   *aUserToOuterSVG = ThebesMatrix(
       SVGContentUtils::GetCTM(static_cast<SVGElement*>(aFrame->GetContent())));
 
-  return aUserToOuterSVG->HasNonTranslation();
+  return aUserToOuterSVG->HasNonTranslation() && !aUserToOuterSVG->IsSingular();
 }
 
 // The logic here comes from _cairo_stroke_style_max_distance_from_path
diff --git a/testing/web-platform/tests/svg/painting/reftests/non-scaling-stroke-002.html b/testing/web-platform/tests/svg/painting/reftests/non-scaling-stroke-002.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>non-scaling-stroke with scaling</title>
+<link rel="help" href="https://svgwg.org/svg2-draft/painting.html#PaintingVectorEffects" />
+<link rel="match" href="green-100x100.svg" />
+<script src="/common/reftest-wait.js"></script>
+<body>
+  <style>
+    body {
+      border: none;
+      margin: 0;
+      width: 200px;
+      height: 200px;
+      transform: scale(2);
+    }
+    svg {
+      width: 100px;
+      height: 100px;
+    }
+    rect {
+      fill: red;
+      stroke: green;
+      stroke-width: 50px;
+      transform: scale(0);
+      animation: reset 0.01s ease-in-out 1 both;
+      vector-effect: non-scaling-stroke;
+    }
+    @keyframes reset { to { transform: none; }}
+  </style>
+  <svg>
+    <rect width="75" height="75"/>
+    <script>
+      onload = () => {
+        requestAnimationFrame(() => { requestAnimationFrame(() => {
+          requestAnimationFrame(() => { takeScreenshot() });
+        })});
+      };
+    </script>
+  </svg>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,7 @@ bool SVGUtils::GetNonScalingStrokeTransform(const nsIFrame* aFrame,`
`1084`	`1084`	`*aUserToOuterSVG = ThebesMatrix(`
`1085`	`1085`	`SVGContentUtils::GetCTM(static_cast<SVGElement*>(aFrame->GetContent())));`
`1086`	`1086`
`1087`		`- return aUserToOuterSVG->HasNonTranslation();`
	`1087`	`+ return aUserToOuterSVG->HasNonTranslation() && !aUserToOuterSVG->IsSingular();`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`	`1090`	`// The logic here comes from _cairo_stroke_style_max_distance_from_path`