Drop RenderSVGResource::{fill,stroke}PaintingResource shims

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 95 matching lines @@
 {
     return path().contains(point, fillRule);
 }
 
 bool RenderSVGShape::fillContains(const FloatPoint& point, bool requiresFill, const WindRule fillRule)
 {
     if (!m_fillBoundingBox.contains(point))
         return false;
 
     bool hasFallback;
-    if (requiresFill && !RenderSVGResource::fillPaintingResource(this, style(), hasFallback))
+    if (requiresFill && !RenderSVGResource::requestPaintingResource(ApplyToFillMode, this, style(), hasFallback))
         return false;
 
     return shapeDependentFillContains(point, fillRule);
 }
 
 bool RenderSVGShape::strokeContains(const FloatPoint& point, bool requiresStroke)
 {
     if (!strokeBoundingBox().contains(point))
         return false;
 
     bool hasFallback;
-    if (requiresStroke && !RenderSVGResource::strokePaintingResource(this, style(), hasFallback))
+    if (requiresStroke && !RenderSVGResource::requestPaintingResource(ApplyToStrokeMode, this, style(), hasFallback))
         return false;
 
     return shapeDependentStrokeContains(point);
 }
 
 void RenderSVGShape::layout()
 {
     bool updateCachedBoundariesInParents = false;
 
     if (m_needsShapeUpdate || m_needsBoundariesUpdate) {
@@ skipping 57 matching lines @@
     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::fillPaintingResource(this, style, hasFallback)) {
+    if (RenderSVGResource* fillPaintingResource = RenderSVGResource::requestPaintingResource(ApplyToFillMode, this, style, hasFallback)) {
         if (fillPaintingResource->applyResource(this, style, context, ApplyToFillMode)) {
             fillShape(context);
             fillPaintingResource->postApplyResource(this, context);
         } else if (hasFallback) {
             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
             if (fallbackResource->applyResource(this, style, context, ApplyToFillMode)) {
                 fillShape(context);
                 fallbackResource->postApplyResource(this, context);
             }
         }
     }
 }
 
 void RenderSVGShape::strokeShape(RenderStyle* style, GraphicsContext* context)
 {
     bool hasFallback;
-    if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(this, style, hasFallback)) {
+    if (RenderSVGResource* strokePaintingResource = RenderSVGResource::requestPaintingResource(ApplyToStrokeMode, this, style, hasFallback)) {
         if (strokePaintingResource->applyResource(this, style, context, ApplyToStrokeMode)) {
             strokeShape(context);
             strokePaintingResource->postApplyResource(this, context);
         } else if (hasFallback) {
             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
             if (fallbackResource->applyResource(this, style, context, ApplyToStrokeMode)) {
                 strokeShape(context);
                 fallbackResource->postApplyResource(this, context);
             }
         }
@@ skipping 228 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();
 }
 
 }