Make RenderSVGResource::requestPaintingResource an implementation detail

Source/core/rendering/svg/RenderSVGResource.h

 /*
  * Copyright (C) Research In Motion Limited 2009-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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 14 matching lines @@
 #include "platform/graphics/Pattern.h"
 
 namespace blink {
 
 enum RenderSVGResourceType {
     MaskerResourceType,
     MarkerResourceType,
     PatternResourceType,
     LinearGradientResourceType,
     RadialGradientResourceType,
-    SolidColorResourceType,
     FilterResourceType,
     ClipperResourceType
 };
 
 enum RenderSVGResourceMode {
     ApplyToFillMode,
     ApplyToStrokeMode,
 };
 
 class GraphicsContext;
 class GraphicsContextStateSaver;
 class RenderObject;
+class RenderSVGResource;
 class RenderStyle;
-class RenderSVGResourceSolidColor;
 
 class SVGPaintServer {
 public:
     explicit SVGPaintServer(Color);
     explicit SVGPaintServer(PassRefPtr<Gradient>);
     explicit SVGPaintServer(PassRefPtr<Pattern>);
 
     static SVGPaintServer requestForRenderer(const RenderObject&, const RenderStyle*, RenderSVGResourceMode);
+    static bool existsForRenderer(const RenderObject&, const RenderStyle*, RenderSVGResourceMode);
 
     void apply(GraphicsContext&, RenderSVGResourceMode, GraphicsContextStateSaver* = 0);
 
     static SVGPaintServer invalid() { return SVGPaintServer(Color(Color::transparent)); }
     bool isValid() const { return m_color != Color::transparent; }
 
     bool isTransformDependent() const { return m_gradient || m_pattern; }
     void prependTransform(const AffineTransform&);
 
 private:
     RefPtr<Gradient> m_gradient;
     RefPtr<Pattern> m_pattern;
     Color m_color;
 };
 
+// If |SVGPaintDescription::hasFallback| is true, |SVGPaintDescription::color| is set to a fallback color.
+struct SVGPaintDescription {
+    SVGPaintDescription() : resource(nullptr), isValid(false), hasFallback(false) { }
+    SVGPaintDescription(Color color) : resource(nullptr), color(color), isValid(true), hasFallback(false) { }
+    SVGPaintDescription(RenderSVGResource* resource) : resource(resource), isValid(true), hasFallback(false) { ASSERT(resource); }
+    SVGPaintDescription(RenderSVGResource* resource, Color fallbackColor) : resource(resource), color(fallbackColor), isValid(true), hasFallback(true) { ASSERT(resource); }
+
+    RenderSVGResource* resource;
+    Color color;
+    bool isValid;
+    bool hasFallback;
+};
+
 class RenderSVGResource {
 public:
     RenderSVGResource() { }
     virtual ~RenderSVGResource() { }
 
     virtual SVGPaintServer preparePaintServer(const RenderObject&);
 
     virtual RenderSVGResourceType resourceType() const = 0;
 
-    // Helper utilities used in the render tree to access resources used for painting shapes/text (gradients & patterns & solid colors only)
-    // If hasFallback gets set to true, the sharedSolidPaintingResource is set to a fallback color.
-    static RenderSVGResource* requestPaintingResource(RenderSVGResourceMode, const RenderObject&, const RenderStyle*, bool& hasFallback);
-    static RenderSVGResourceSolidColor* sharedSolidPaintingResource();
+    // Helper utilities used in to access the underlying resources for DRT.
+    static SVGPaintDescription requestPaintForDRT(const RenderObject&, const RenderStyle*, RenderSVGResourceMode);

[f(malita), 2014/10/21 13:57:36]

nit: I would prefer not to have DRT-specific method names here (even if DRT is
the only client) - the comment should suffice. I'll leave it up to you though.

 
     static void markForLayoutAndParentResourceInvalidation(RenderObject*, bool needsLayout = true);
 };
 
 #define DEFINE_RENDER_SVG_RESOURCE_TYPE_CASTS(thisType, typeName) \
     DEFINE_TYPE_CASTS(thisType, RenderSVGResource, resource, resource->resourceType() == typeName, resource.resourceType() == typeName)
 
 }
 
 #endif