Reduce how often LayoutSVGShape::updateShapeFromElement is called

Source/core/layout/svg/LayoutSVGPath.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2005, 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
  * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
  * Copyright (C) 2011 University of Szeged
@@ skipping 32 matching lines @@
 {
 }
 
 LayoutSVGPath::~LayoutSVGPath()
 {
 }
 
 void LayoutSVGPath::updateShapeFromElement()
 {
     LayoutSVGShape::updateShapeFromElement();
+    updateZeroLengthSubpaths();
+}
+
+void LayoutSVGPath::updateStrokeAndFillBoundingBoxes()
+{
+    LayoutSVGShape::updateStrokeAndFillBoundingBoxes();
+
+    // TODO(pdr): It would be ideal to only call this in updateShapeFromElement

[fs, 2015/06/16 10:54:02]

I think the first part (line) of this makes sense. Not so sure about the second
one though - if the/a marker changes we'd want to update the bounds, but not
update the shape since the position ought to be the same still.

[pdr., 2015/06/17 03:50:49]

Done

+    // and have marker invalidation call setNeedsShapeUpdate.
     processMarkerPositions();
-    updateZeroLengthSubpaths();
+    if (!m_markerPositions.isEmpty())
+        m_strokeBoundingBox.unite(markerRect(strokeWidth()));
 
-    m_strokeBoundingBox = calculateUpdatedStrokeBoundingBox();
+    if (style()->svgStyle().hasStroke()) {
+        // FIXME: zero-length subpaths do not respect vector-effect = non-scaling-stroke.
+        float strokeWidth = this->strokeWidth();
+        for (size_t i = 0; i < m_zeroLengthLinecapLocations.size(); ++i)
+            m_strokeBoundingBox.unite(zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], strokeWidth));
+    }
 }
 
 FloatRect LayoutSVGPath::hitTestStrokeBoundingBox() const
 {
     const SVGComputedStyle& svgStyle = style()->svgStyle();
     if (svgStyle.hasStroke())
         return m_strokeBoundingBox;
 
     // Implementation of http://dev.w3.org/fxtf/css-masking-1/#compute-stroke-bounding-box
     // except that we ignore whether the stroke is none.
@@ skipping 17 matching lines @@
     }
 
     box.inflate(delta);
 
     for (size_t i = 0; i < m_zeroLengthLinecapLocations.size(); ++i)
         box.unite(zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], strokeWidth));
 
     return box;
 }
 
-FloatRect LayoutSVGPath::calculateUpdatedStrokeBoundingBox() const
-{
-    FloatRect strokeBoundingBox = m_strokeBoundingBox;
-
-    if (!m_markerPositions.isEmpty())
-        strokeBoundingBox.unite(markerRect(strokeWidth()));
-
-    if (style()->svgStyle().hasStroke()) {
-        // FIXME: zero-length subpaths do not respect vector-effect = non-scaling-stroke.
-        float strokeWidth = this->strokeWidth();
-        for (size_t i = 0; i < m_zeroLengthLinecapLocations.size(); ++i)
-            strokeBoundingBox.unite(zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], strokeWidth));
-    }
-
-    return strokeBoundingBox;
-}
-
 bool LayoutSVGPath::shapeDependentStrokeContains(const FloatPoint& point)
 {
     if (LayoutSVGShape::shapeDependentStrokeContains(point))
         return true;
 
     const SVGComputedStyle& svgStyle = style()->svgStyle();
     const float strokeWidth = this->strokeWidth();
     for (size_t i = 0; i < m_zeroLengthLinecapLocations.size(); ++i) {
         ASSERT(svgStyle.hasStroke());
         if (svgStyle.capStyle() == SquareCap) {
@@ skipping 80 matching lines @@
     ASSERT(resources);
 
     LayoutSVGResourceMarker* markerStart = resources->markerStart();
 
     SVGMarkerData markerData(m_markerPositions, markerStart ? markerStart->orientType() == SVGMarkerOrientAutoStartReverse : false);
     path().apply(&markerData, SVGMarkerData::updateFromPathElement);
     markerData.pathIsDone();
 }
 
 }