Drop special-case handling of zero-length subpaths

Source/core/paint/SVGShapePainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/SVGShapePainter.h"
 
-#include "core/layout/svg/LayoutSVGPath.h"
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 #include "core/layout/svg/LayoutSVGShape.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/layout/svg/SVGMarkerData.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/paint/FloatClipRecorder.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
@@ skipping 147 matching lines @@
         context->drawRect(m_layoutSVGShape.objectBoundingBox(), paint);
         break;
     case EllipseGeometryFastPath:
         context->drawOval(m_layoutSVGShape.objectBoundingBox(), paint);
         break;
     default:
         Path* usePath = &m_layoutSVGShape.path();
         if (m_layoutSVGShape.hasNonScalingStroke())
             usePath = m_layoutSVGShape.nonScalingStrokePath(usePath, m_layoutSVGShape.nonScalingStrokeTransform());
         context->drawPath(usePath->skPath(), paint);
-        strokeZeroLengthLineCaps(context, paint);
     }
 }
 
 void SVGShapePainter::paintMarkers(const PaintInfo& paintInfo, const FloatRect& boundingBox)
 {
     const Vector<MarkerPosition>* markerPositions = m_layoutSVGShape.markerPositions();
     if (!markerPositions || markerPositions->isEmpty())
         return;
 
     SVGResources* resources = SVGResourcesCache::cachedResourcesForLayoutObject(&m_layoutSVGShape);
@@ skipping 35 matching lines @@
         return;
 
     TransformRecorder transformRecorder(*paintInfo.context, marker, marker.markerTransformation(position.origin, position.angle, strokeWidth));
     Optional<FloatClipRecorder> clipRecorder;
     if (SVGLayoutSupport::isOverflowHidden(&marker))
         clipRecorder.emplace(*paintInfo.context, marker, paintInfo.phase, marker.viewport());
 
     SVGContainerPainter(marker).paint(paintInfo);
 }
 
-void SVGShapePainter::strokeZeroLengthLineCaps(GraphicsContext* context, const SkPaint& strokePaint)
-{
-    const Vector<FloatPoint>* zeroLengthLineCaps = m_layoutSVGShape.zeroLengthLineCaps();
-    if (!zeroLengthLineCaps || zeroLengthLineCaps->isEmpty())
-        return;
-
-    // We need a paint for filling.
-    SkPaint fillPaint = strokePaint;
-    fillPaint.setStyle(SkPaint::kFill_Style);
-
-    AffineTransform nonScalingTransform;
-    bool hasNonScalingStroke = m_layoutSVGShape.hasNonScalingStroke();
-    if (hasNonScalingStroke)
-        nonScalingTransform = m_layoutSVGShape.nonScalingStrokeTransform();
-
-    for (const FloatPoint& capPosition : *zeroLengthLineCaps) {
-        FloatPoint position = capPosition;
-        // If non-scaling-stroke is in effect, apply the transform to the
-        // position (being the non-stroke geometry), and then paint the
-        // requested shape. The CTM should've been adjusted in
-        // SVGShapePainter::paint.
-        if (hasNonScalingStroke)
-            position = nonScalingTransform.mapPoint(position);
-        FloatRect subpathRect = LayoutSVGPath::zeroLengthSubpathRect(position, m_layoutSVGShape.strokeWidth());
-        if (m_layoutSVGShape.style()->svgStyle().capStyle() == SquareCap)
-            context->drawRect(subpathRect, fillPaint);
-        else
-            context->drawOval(subpathRect, fillPaint);
-    }
-}
-
 } // namespace blink