Introduce SVGPaintServer

Source/core/rendering/svg/RenderSVGShape.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 10 matching lines @@
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/rendering/svg/RenderSVGShape.h"
 
+#include "core/paint/SVGPaintServer.h"
 #include "core/rendering/GraphicsContextAnnotator.h"
 #include "core/rendering/HitTestRequest.h"
 #include "core/rendering/PointerEventsHitRules.h"
 #include "core/rendering/svg/RenderSVGResourceMarker.h"
-#include "core/rendering/svg/RenderSVGResourceSolidColor.h"
 #include "core/rendering/svg/SVGPathData.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"
 #include "core/svg/SVGGraphicsElement.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "wtf/MathExtras.h"
 
@@ skipping 147 matching lines @@
     if (!SVGResources::supportsMarkers(*toSVGGraphicsElement(element())))
         return false;
 
     SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(this);
     if (!resources)
         return false;
 
     return resources->markerStart() || resources->markerMid() || resources->markerEnd();
 }
 
-void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context)
-{
-    bool hasFallback;
-    if (RenderSVGResource* fillPaintingResource = RenderSVGResource::requestPaintingResource(ApplyToFillMode, this, style, hasFallback)) {
-        if (fillPaintingResource->applyResource(this, style, context, ApplyToFillMode)) {
-            fillShape(context);
-            fillPaintingResource->postApplyResource(context);
-        } else if (hasFallback) {
-            RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
-            if (fallbackResource->applyResource(this, style, context, ApplyToFillMode)) {
-                fillShape(context);
-                fallbackResource->postApplyResource(context);
-            }
-        }
-    }
-}
-
-void RenderSVGShape::strokeShape(RenderStyle* style, GraphicsContext* context)
-{
-    bool hasFallback;
-    if (RenderSVGResource* strokePaintingResource = RenderSVGResource::requestPaintingResource(ApplyToStrokeMode, this, style, hasFallback)) {
-        if (strokePaintingResource->applyResource(this, style, context, ApplyToStrokeMode)) {
-            strokeShape(context);
-            strokePaintingResource->postApplyResource(context);
-        } else if (hasFallback) {
-            RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
-            if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode)) {
-                strokeShape(context);
-                fallbackResource->postApplyResource(context);
-            }
-        }
-    }
-}
-
 void RenderSVGShape::paint(PaintInfo& paintInfo, const LayoutPoint&)
 {
     ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);
     if (paintInfo.phase != PaintPhaseForeground
         || style()->visibility() == HIDDEN
         || isShapeEmpty())
         return;
 
     FloatRect boundingBox = paintInvalidationRectInLocalCoordinates();
     if (!SVGRenderSupport::paintInfoIntersectsPaintInvalidationRect(boundingBox, m_localTransform, paintInfo))
         return;
 
     PaintInfo childPaintInfo(paintInfo);
 
     GraphicsContextStateSaver stateSaver(*childPaintInfo.context);
     childPaintInfo.applyTransform(m_localTransform);
 
     SVGRenderingContext renderingContext(this, childPaintInfo);
 
     if (renderingContext.isRenderingPrepared()) {
         const SVGRenderStyle& svgStyle = style()->svgStyle();
         if (svgStyle.shapeRendering() == SR_CRISPEDGES)
             childPaintInfo.context->setShouldAntialias(false);
 
         for (int i = 0; i < 3; i++) {
             switch (svgStyle.paintOrderType(i)) {
-            case PT_FILL:
-                fillShape(this->style(), childPaintInfo.context);
+            case PT_FILL: {
+                GraphicsContextStateSaver stateSaver(*childPaintInfo.context, false);
+                if (!SVGPaintServer::updateGraphicsContext(stateSaver, style(), *this, ApplyToFillMode))
+                    break;
+                fillShape(childPaintInfo.context);
                 break;
+            }
             case PT_STROKE:
                 if (svgStyle.hasVisibleStroke()) {
                     GraphicsContextStateSaver stateSaver(*childPaintInfo.context, false);
                     AffineTransform nonScalingTransform;
 
                     if (hasNonScalingStroke()) {
                         AffineTransform nonScalingTransform = nonScalingStrokeTransform();
                         if (!setupNonScalingStrokeContext(nonScalingTransform, stateSaver))
                             return;
                     }
 
-                    strokeShape(this->style(), childPaintInfo.context);
+                    if (!SVGPaintServer::updateGraphicsContext(stateSaver, style(), *this, ApplyToStrokeMode))
+                        break;
+                    strokeShape(childPaintInfo.context);
                 }
                 break;
             case PT_MARKERS:
                 if (!m_markerPositions.isEmpty())
                     drawMarkers(childPaintInfo);
                 break;
             default:
                 ASSERT_NOT_REACHED();
                 break;
             }
@@ skipping 174 matching lines @@
     ASSERT(resources);
 
     RenderSVGResourceMarker* markerStart = resources->markerStart();
 
     SVGMarkerData markerData(m_markerPositions, markerStart ? markerStart->orientType() == SVGMarkerOrientAutoStartReverse : false);
     m_path->apply(&markerData, SVGMarkerData::updateFromPathElement);
     markerData.pathIsDone();
 }
 
 }