Move SVG shape painting code to SVGShapePainter

Source/core/rendering/svg/RenderSVGRect.cpp

 /*
  * Copyright (C) 2011 University of Szeged
  * Copyright (C) 2011 Renata Hodovan <reni@webkit.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 10 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "core/rendering/svg/RenderSVGRect.h"
-#include "platform/graphics/GraphicsContext.h"
+#include "core/svg/SVGRectElement.h"
 
 namespace blink {
 
 RenderSVGRect::RenderSVGRect(SVGRectElement* node)
     : RenderSVGShape(node)
     , m_usePathFallback(false)
 {
 }
 
 RenderSVGRect::~RenderSVGRect()
@@ skipping 37 matching lines @@
 
     if (style()->svgStyle().hasStroke()) {
         float strokeWidth = this->strokeWidth();
         m_innerStrokeRect.inflate(-strokeWidth / 2);
         m_outerStrokeRect.inflate(strokeWidth / 2);
     }
 
     m_strokeBoundingBox = m_outerStrokeRect;
 }
 
-void RenderSVGRect::fillShape(GraphicsContext* context) const
-{
-    if (m_usePathFallback) {
-        RenderSVGShape::fillShape(context);
-        return;
-    }
-
-    context->fillRect(m_fillBoundingBox);
-}
-
-void RenderSVGRect::strokeShape(GraphicsContext* context) const
-{
-    if (!style()->svgStyle().hasVisibleStroke())
-        return;
-
-    if (m_usePathFallback) {
-        RenderSVGShape::strokeShape(context);
-        return;
-    }
-
-    context->strokeRect(m_fillBoundingBox, strokeWidth());
-}
-
 bool RenderSVGRect::shapeDependentStrokeContains(const FloatPoint& point)
 {
     // The optimized contains code below does not support non-smooth strokes so we need
     // to fall back to RenderSVGShape::shapeDependentStrokeContains in these cases.
     if (m_usePathFallback || !hasSmoothStroke()) {
         if (!hasPath())
             RenderSVGShape::updateShapeFromElement();
         return RenderSVGShape::shapeDependentStrokeContains(point);
     }
 
     return m_outerStrokeRect.contains(point, FloatRect::InsideOrOnStroke) && !m_innerStrokeRect.contains(point, FloatRect::InsideButNotOnStroke);
 }
 
 bool RenderSVGRect::shapeDependentFillContains(const FloatPoint& point, const WindRule fillRule) const
 {
     if (m_usePathFallback)
         return RenderSVGShape::shapeDependentFillContains(point, fillRule);
     return m_fillBoundingBox.contains(point.x(), point.y());
 }
 
 }