Factor SVGMarkerPainter into SVGShapePainter

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/paint/ObjectPainter.h"
-#include "core/paint/SVGMarkerPainter.h"
+#include "core/paint/SVGContainerPainter.h"
 #include "core/rendering/GraphicsContextAnnotator.h"
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/svg/RenderSVGPath.h"
+#include "core/rendering/svg/RenderSVGResourceMarker.h"
 #include "core/rendering/svg/RenderSVGShape.h"
 #include "core/rendering/svg/SVGMarkerData.h"
 #include "core/rendering/svg/SVGRenderSupport.h"
 #include "core/rendering/svg/SVGRenderingContext.h"
 #include "core/rendering/svg/SVGResources.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 
 namespace blink {
 
 static bool setupNonScalingStrokeContext(AffineTransform& strokeTransform, GraphicsContextStateSaver& stateSaver)
@@ skipping 132 matching lines @@
     RenderSVGResourceMarker* markerStart = resources->markerStart();
     RenderSVGResourceMarker* markerMid = resources->markerMid();
     RenderSVGResourceMarker* markerEnd = resources->markerEnd();
     if (!markerStart && !markerMid && !markerEnd)
         return;
 
     float strokeWidth = m_renderSVGShape.strokeWidth();
     unsigned size = markerPositions->size();
     for (unsigned i = 0; i < size; ++i) {
         if (RenderSVGResourceMarker* marker = SVGMarkerData::markerForType((*markerPositions)[i].type, markerStart, markerMid, markerEnd))
-            SVGMarkerPainter(*marker).paint(paintInfo, (*markerPositions)[i], strokeWidth);
+            paintMarker(paintInfo, *marker, (*markerPositions)[i], strokeWidth);
     }
 }
 
+void SVGShapePainter::paintMarker(PaintInfo& paintInfo, RenderSVGResourceMarker& marker, const MarkerPosition& position, float strokeWidth)
+{
+    // An empty viewBox disables rendering.
+    SVGMarkerElement* markerElement = toSVGMarkerElement(marker.element());
+    ASSERT(markerElement);
+    if (markerElement->hasAttribute(SVGNames::viewBoxAttr) && markerElement->viewBox()->currentValue()->isValid() && markerElement->viewBox()->currentValue()->value().isEmpty())
+        return;
+
+    PaintInfo info(paintInfo);
+    GraphicsContextStateSaver stateSaver(*info.context, false);
+    info.applyTransform(marker.markerTransformation(position.origin, position.angle, strokeWidth), &stateSaver);
+
+    if (SVGRenderSupport::isOverflowHidden(&marker)) {
+        stateSaver.saveIfNeeded();
+        info.context->clip(marker.viewport());
+    }
+
+    SVGContainerPainter(marker).paint(info);
+}
+
 void SVGShapePainter::strokeZeroLengthLineCaps(GraphicsContext* context)
 {
     const Vector<FloatPoint>* zeroLengthLineCaps = m_renderSVGShape.zeroLengthLineCaps();
     if (!zeroLengthLineCaps || zeroLengthLineCaps->isEmpty())
         return;
 
     Path* usePath;
     AffineTransform nonScalingTransform;
 
     if (m_renderSVGShape.hasNonScalingStroke())
@@ skipping 16 matching lines @@
     tempPath.clear();
     if (m_renderSVGShape.style()->svgStyle().capStyle() == SquareCap)
         tempPath.addRect(RenderSVGPath::zeroLengthSubpathRect(linecapPosition, m_renderSVGShape.strokeWidth()));
     else
         tempPath.addEllipse(RenderSVGPath::zeroLengthSubpathRect(linecapPosition, m_renderSVGShape.strokeWidth()));
 
     return &tempPath;
 }
 
 } // namespace blink