Drop special-case handling of zero-length subpaths

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 14 matching lines @@
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 
 #include "core/layout/svg/LayoutSVGPath.h"
 
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
-#include "core/layout/svg/SVGSubpathData.h"
 #include "core/svg/SVGGeometryElement.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
 LayoutSVGPath::LayoutSVGPath(SVGGeometryElement* node)
     : LayoutSVGShape(node)
 {
 }
 
 LayoutSVGPath::~LayoutSVGPath()
 {
 }
 
-void LayoutSVGPath::updateShapeFromElement()
-{
-    LayoutSVGShape::updateShapeFromElement();
-    updateZeroLengthSubpaths();
-}
-
 void LayoutSVGPath::updateStrokeAndFillBoundingBoxes()
 {
     LayoutSVGShape::updateStrokeAndFillBoundingBoxes();
 
     // TODO(pdr): We should only call this in updateShapeFromElement.
     processMarkerPositions();
     if (!m_markerPositions.isEmpty())
         m_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)
-            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 10 matching lines @@
         const float miter = svgStyle.strokeMiterLimit();
         if (miter < M_SQRT2 && svgStyle.hasSquareCapStyle())
             delta *= M_SQRT2;
         else
             delta *= miter;
     } else if (svgStyle.hasSquareCapStyle()) {
         delta *= M_SQRT2;
     }
 
     box.inflate(delta);
-
-    for (size_t i = 0; i < m_zeroLengthLinecapLocations.size(); ++i)
-        box.unite(zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], strokeWidth));
-
     return box;
 }
 
-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) {
-            if (zeroLengthSubpathRect(m_zeroLengthLinecapLocations[i], strokeWidth).contains(point))
-                return true;
-        } else {
-            ASSERT(svgStyle.capStyle() == RoundCap);
-            FloatPoint radiusVector(point.x() - m_zeroLengthLinecapLocations[i].x(), point.y() -  m_zeroLengthLinecapLocations[i].y());
-            if (radiusVector.lengthSquared() < strokeWidth * strokeWidth * .25f)
-                return true;
-        }
-    }
-    return false;
-}
-
-bool LayoutSVGPath::shouldStrokeZeroLengthSubpath() const
-{
-    // Spec(11.4): Any zero length subpath shall not be stroked if the "stroke-linecap" property has a value of butt
-    // but shall be stroked if the "stroke-linecap" property has a value of round or square
-    return style()->svgStyle().hasStroke() && style()->svgStyle().capStyle() != ButtCap;
-}
-
-FloatRect LayoutSVGPath::zeroLengthSubpathRect(const FloatPoint& linecapPosition, float strokeWidth)
-{
-    return FloatRect(linecapPosition.x() - strokeWidth / 2, linecapPosition.y() - strokeWidth / 2, strokeWidth, strokeWidth);
-}
-
-void LayoutSVGPath::updateZeroLengthSubpaths()
-{
-    m_zeroLengthLinecapLocations.clear();
-
-    if (!strokeWidth() || !shouldStrokeZeroLengthSubpath())
-        return;
-
-    SVGSubpathData subpathData(m_zeroLengthLinecapLocations);
-    path().apply(&subpathData, SVGSubpathData::updateFromPathElement);
-    subpathData.pathIsDone();
-}
-
 FloatRect LayoutSVGPath::markerRect(float strokeWidth) const
 {
     ASSERT(!m_markerPositions.isEmpty());
 
     SVGResources* resources = SVGResourcesCache::cachedResourcesForLayoutObject(this);
     ASSERT(resources);
 
     LayoutSVGResourceMarker* markerStart = resources->markerStart();
     LayoutSVGResourceMarker* markerMid = resources->markerMid();
     LayoutSVGResourceMarker* markerEnd = resources->markerEnd();
@@ skipping 34 matching lines @@
     ASSERT(resources);
 
     LayoutSVGResourceMarker* markerStart = resources->markerStart();
 
     SVGMarkerData markerData(m_markerPositions, markerStart ? markerStart->orientType() == SVGMarkerOrientAutoStartReverse : false);
     path().apply(&markerData, SVGMarkerData::updateFromPathElement);
     markerData.pathIsDone();
 }
 
 }