Reduce how often LayoutSVGShape::updateShapeFromElement is called

Source/core/layout/svg/LayoutSVGRect.cpp

 /*
  * Copyright (C) 2011 University of Szeged
  * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 27 matching lines @@
     , m_usePathFallback(false)
 {
 }
 
 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(
         FloatPoint(
             lengthContext.valueForLength(styleRef().svgStyle().x(), styleRef(), SVGLengthMode::Width),
             lengthContext.valueForLength(styleRef().svgStyle().y(), styleRef(), SVGLengthMode::Height)),
         boundingBoxSize);
     m_strokeBoundingBox = m_fillBoundingBox;
     if (style()->svgStyle().hasStroke())
         m_strokeBoundingBox.inflate(strokeWidth() / 2);
 }
 
 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);
     }
 
     const float halfStrokeWidth = strokeWidth() / 2;
     const float halfWidth = m_fillBoundingBox.width() / 2;
     const float halfHeight = m_fillBoundingBox.height() / 2;
 
     const FloatPoint fillBoundingBoxCenter = FloatPoint(m_fillBoundingBox.x() + halfWidth, m_fillBoundingBox.y() + halfHeight);
     const float absDeltaX = std::abs(point.x() - fillBoundingBoxCenter.x());
@@ skipping 33 matching lines @@
     // An approximation of sqrt(2) is used here because at certain precise
     // miterlimits, the join style used might not be correct (e.g. a miterlimit
     // of 1.4142135 should result in bevel joins, but may be drawn using miter
     // joins).
     return svgStyle.strokeDashArray()->isEmpty()
         && svgStyle.joinStyle() == MiterJoin
         && svgStyle.strokeMiterLimit() >= 1.5;
 }
 
 }