Move pathLength scale-factor computation to SVGPathElement

third_party/WebKit/Source/core/layout/svg/LayoutSVGShape.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 49 matching lines @@
 {
     if (!m_path)
         m_path = adoptPtr(new Path());
     *m_path = toSVGGeometryElement(element())->asPath();
     if (m_rareData.get())
         m_rareData->m_cachedNonScalingStrokePath.clear();
 }
 
 float LayoutSVGShape::dashScaleFactor() const
 {
-    if (!isSVGPathElement(element()))
+    if (!isSVGPathElement(element())
+        || !styleRef().svgStyle().strokeDashArray()->size())
         return 1;
-    SVGPathElement& pathElement = toSVGPathElement(*element());
-    if (!pathElement.pathLength()->isSpecified())
-        return 1;
-    const SVGComputedStyle& svgStyle = styleRef().svgStyle();
-    float authorPathLength = pathElement.pathLength()->currentValue()->value();
-    if (authorPathLength < 0 || !svgStyle.strokeDashArray()->size())
-        return 1;
-    if (!authorPathLength)
-        return 0;
-    // Since we know this is a <path> element, we also know the source of the
-    // path - the 'd' presentation attribute. Since the StylePath already
-    // caches the computed path length for use, use that here directly.
-    float computedPathLength = svgStyle.d()->length();
-    if (!computedPathLength)
-        return 1;
-    return computedPathLength / authorPathLength;
+    return toSVGPathElement(*element()).pathLengthScaleFactor();
 }
 
 void LayoutSVGShape::updateShapeFromElement()
 {
     createPath();
 
     m_fillBoundingBox = calculateObjectBoundingBox();
     m_strokeBoundingBox = calculateStrokeBoundingBox();
 }
 
@@ skipping 221 matching lines @@
 }
 
 LayoutSVGShapeRareData& LayoutSVGShape::ensureRareData() const
 {
     if (!m_rareData)
         m_rareData = adoptPtr(new LayoutSVGShapeRareData());
     return *m_rareData.get();
 }
 
 } // namespace blink