SVG Text NG: Fix text scaling by :root scaling changes

Scaling changes on :root should trigger layout of SVG <text>s. This CL fixes a regression by crrev.com/1011855. Bug: 1365243 Change-Id: Ied64facb518b9534567609961d37fbe6dcc2d3b5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4113625 Auto-Submit: Kent Tamura <tkent@chromium.org> Commit-Queue: Koji Ishii <kojii@chromium.org> Reviewed-by: Koji Ishii <kojii@chromium.org> Cr-Commit-Position: refs/heads/main@{#1084853}
chromium · Dec 19, 2022 · a4da97d · a4da97d
1 parent 085d048
commit a4da97d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/third_party/blink/renderer/core/layout/layout_block.cc b/third_party/blink/renderer/core/layout/layout_block.cc
@@ -288,8 +288,12 @@ void LayoutBlock::StyleDidChange(StyleDifference diff,
         Layer() ? Layer()->Transform() : nullptr);
     // Compare local scale before and after.
     if (old_squared_scale != new_squared_scale) {
-      for (LayoutBox* box : *View()->SvgTextDescendantsMap().at(this))
+      for (LayoutBox* box : *View()->SvgTextDescendantsMap().at(this)) {
         To<LayoutNGSVGText>(box)->SetNeedsTextMetricsUpdate();
+        if (GetNode() == GetDocument().documentElement()) {
+          box->SetNeedsLayout(layout_invalidation_reason::kStyleChange);
+        }
+      }
     }
   }
 }

diff --git a/...rty/blink/web_tests/external/wpt/svg/text/reftests/transform-dynamic-change-root-ref.html b/...rty/blink/web_tests/external/wpt/svg/text/reftests/transform-dynamic-change-root-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+<svg><text y=30>Text</text></svg>
+</body>
+</html>
diff --git a/...d_party/blink/web_tests/external/wpt/svg/text/reftests/transform-dynamic-change-root.html b/...d_party/blink/web_tests/external/wpt/svg/text/reftests/transform-dynamic-change-root.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://crbug.com/1365243">
+<link rel="match" href="transform-dynamic-change-root-ref.html">
+<style>
+:root { scale: 1 5; }
+</style>
+
+<body>
+<svg><text y=30>Text</text></svg>
+<script>
+requestAnimationFrame(() => {
+  requestAnimationFrame(() => {
+    document.styleSheets[0].removeRule(0);
+    document.documentElement.classList.remove('reftest-wait');
+  });
+});
+</script>
+</body>
+</html>