Drop RenderSVGResource::{fill,stroke}PaintingResource shims

Source/core/rendering/svg/SVGInlineTextBox.cpp

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 345 matching lines @@
     bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderStyle*, RenderSVGResourceModeFlags);
     void releasePaintingResource(GraphicsContext*&);
 
 private:
     RenderObject& m_renderer;
     TextRun::RenderingContext* m_renderingContext;
     RenderSVGResource* m_paintingResource;
 };
 
 bool PaintingResourceScope::acquirePaintingResource(GraphicsContext*& context, float scalingFactor,
-    RenderStyle* style, RenderSVGResourceModeFlags resourceMode)
+    RenderStyle* style, RenderSVGResourceModeFlags resourceModeFlags)
 {
     // Callers must save the context state before calling when scalingFactor is not 1.
     ASSERT(scalingFactor);
     ASSERT(style);
-    ASSERT(resourceMode != ApplyToDefaultMode);
+    ASSERT(resourceModeFlags != ApplyToDefaultMode);
+    RenderSVGResourceMode resourceMode = static_cast<RenderSVGResourceMode>(resourceModeFlags & (ApplyToFillMode | ApplyToStrokeMode));
+    ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
 
     bool hasFallback = false;
-    if (resourceMode & ApplyToFillMode)
-        m_paintingResource = RenderSVGResource::fillPaintingResource(&m_renderer, style, hasFallback);
-    else if (resourceMode & ApplyToStrokeMode)
-        m_paintingResource = RenderSVGResource::strokePaintingResource(&m_renderer, style, hasFallback);
-    else {
-        // We're either called for stroking or filling.
-        ASSERT_NOT_REACHED();
-    }
-
+    m_paintingResource = RenderSVGResource::requestPaintingResource(resourceMode, &m_renderer, style, hasFallback);
     if (!m_paintingResource)
         return false;
 
-    if (!m_paintingResource->applyResource(&m_renderer, style, context, resourceMode)) {
+    if (!m_paintingResource->applyResource(&m_renderer, style, context, resourceModeFlags)) {
         if (hasFallback) {
             m_paintingResource = RenderSVGResource::sharedSolidPaintingResource();
-            m_paintingResource->applyResource(&m_renderer, style, context, resourceMode);
+            m_paintingResource->applyResource(&m_renderer, style, context, resourceModeFlags);
         }
     }
 
-    if (scalingFactor != 1 && resourceMode & ApplyToStrokeMode)
+    if (scalingFactor != 1 && resourceModeFlags & ApplyToStrokeMode)
         context->setStrokeThickness(context->strokeThickness() * scalingFactor);
 
 #if ENABLE(SVG_FONTS)
     // SVG Fonts need access to the painting resource used to draw the current text chunk.
     if (m_renderingContext)
         static_cast<SVGTextRunRenderingContext*>(m_renderingContext)->setActivePaintingResource(m_paintingResource);
 #endif
 
     return true;
 }
@@ skipping 388 matching lines @@
                 renderer().updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
                 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, locationInContainer, rect))
                     return true;
              }
         }
     }
     return false;
 }
 
 } // namespace blink