Reduce how often LayoutSVGShape::updateShapeFromElement is called

Source/core/layout/svg/LayoutSVGRect.cpp

Index: Source/core/layout/svg/LayoutSVGRect.cpp
diff --git a/Source/core/layout/svg/LayoutSVGRect.cpp b/Source/core/layout/svg/LayoutSVGRect.cpp
index 18b0ccd737b67602e2f4f40fe69236ed49f814fe..bc07ddc62f9ab4e13013996f8f817998e88f6aff 100644
--- a/Source/core/layout/svg/LayoutSVGRect.cpp
+++ b/Source/core/layout/svg/LayoutSVGRect.cpp
@@ -45,35 +45,46 @@ LayoutSVGRect::~LayoutSVGRect()
 
 void LayoutSVGRect::updateShapeFromElement()
 {
-    // Before creating a new object we need to clear the cached bounding box
-    // to avoid using garbage.
-    m_fillBoundingBox = FloatRect();
-    m_strokeBoundingBox = FloatRect();
     m_usePathFallback = false;
-    SVGRectElement* rect = toSVGRectElement(element());
-    ASSERT(rect);
 
-    SVGLengthContext lengthContext(rect);
+    // Fallback to LayoutSVGShape and path-based hit detection if the rect
+    // has rounded corners or a non-scaling or non-simple stroke.
+    SVGLengthContext lengthContext(toSVGRectElement(element()));
+    if (lengthContext.valueForLength(styleRef().svgStyle().rx(), styleRef(), SVGLengthMode::Width) > 0
+        || lengthContext.valueForLength(styleRef().svgStyle().ry(), styleRef(), SVGLengthMode::Height) > 0
+        || hasNonScalingStroke()
+        || !definitelyHasSimpleStroke()) {
+        LayoutSVGShape::updateShapeFromElement();
+        m_usePathFallback = true;
+        return;
+    }
+
+    clearPath();
+}
+
+void LayoutSVGRect::updateStrokeAndFillBoundingBoxes()
+{
+    SVGLengthContext lengthContext(toSVGRectElement(element()));
     FloatSize boundingBoxSize(
         lengthContext.valueForLength(styleRef().width(), styleRef(), SVGLengthMode::Width),
         lengthContext.valueForLength(styleRef().height(), styleRef(), SVGLengthMode::Height));
 
     // Spec: "A negative value is an error."
-    if (boundingBoxSize.width() < 0 || boundingBoxSize.height() < 0)
+    if (boundingBoxSize.width() < 0 || boundingBoxSize.height() < 0) {
+        m_fillBoundingBox = FloatRect();
+        m_strokeBoundingBox = FloatRect();
         return;
+    }
 
-    // Spec: "A value of zero disables rendering of the element."
-    if (!boundingBoxSize.isEmpty()) {
-        // Fallback to LayoutSVGShape and path-based hit detection if the rect
-        // has rounded corners or a non-scaling or non-simple stroke.
-        if (lengthContext.valueForLength(styleRef().svgStyle().rx(), styleRef(), SVGLengthMode::Width) > 0
-            || lengthContext.valueForLength(styleRef().svgStyle().ry(), styleRef(), SVGLengthMode::Height) > 0
-            || hasNonScalingStroke()
-            || !definitelyHasSimpleStroke()) {
-            LayoutSVGShape::updateShapeFromElement();
-            m_usePathFallback = true;
+    if (m_usePathFallback) {
+        // Spec: "A value of zero disables rendering of the element." so we can skip
+        // the path fallback and rely on the existing bounding box calculation.
+        if (!boundingBoxSize.isEmpty()) {
+            LayoutSVGShape::updateStrokeAndFillBoundingBoxes();
             return;
         }
+        m_usePathFallback = false;
+        clearPath();
     }
 
     m_fillBoundingBox = FloatRect(
@@ -91,7 +102,7 @@ bool LayoutSVGRect::shapeDependentStrokeContains(const FloatPoint& point)
     // The optimized code below does not support non-simple strokes so we need
     // to fall back to LayoutSVGShape::shapeDependentStrokeContains in these cases.
     if (m_usePathFallback || !definitelyHasSimpleStroke()) {
-        if (!hasPath())
+        if (!m_usePathFallback)
             LayoutSVGShape::updateShapeFromElement();
         return LayoutSVGShape::shapeDependentStrokeContains(point);
     }