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 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);
 
     void apply(GraphicsContext&, RenderSVGResourceMode, GraphicsContextStateSaver* = 0);
@@ skipping 12 matching lines @@
 
 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 the render tree to access resources used for
+    // painting shapes/text (gradients & patterns & solid colors only).
+    // If |PaintDescription::hasFallback| is true, |PaintDescription::color| is set to a fallback color.
+    struct PaintDescription {

[f(malita), 2014/10/20 14:51:06]

This smells close enough to a paint server to make me wonder why we're not just
building/returning one of those instead.

I think {fill,stroke}Contains() are the only users not turning this into a paint
server immediately, no? Not sure whether returning a fully resolved server is
going to show a perf impact there, but if it does we could add a simplified
hasValidPaintServer() for them.

Is this feasible?

[fs, 2014/10/20 15:20:20]

It's the case you mention and the DRT code. For DRT, the only missing piece is
the id off the element. It's quite possible we could just pass that from the
SVGRenderStyle (since it should be validated already.)

As for hasValidPaintServer, I had that in a previous CL, but ended up
disappearing it... It should be unproblematic to reappear it though. I'll try it
out.

[fs, 2014/10/20 15:52:24]

Oh, and it'll not be possible to tell a fallback color from a regular color.
That doesn't seem like a big issue though (and I'll let the try-bots figure that
out...)

+        PaintDescription() : resource(nullptr), isValid(false), hasFallback(false) { }
+        PaintDescription(Color color) : resource(nullptr), color(color), isValid(true), hasFallback(false) { }
+        PaintDescription(RenderSVGResource* resource) : resource(resource), isValid(true), hasFallback(false) { ASSERT(resource); }
+        PaintDescription(RenderSVGResource* resource, Color fallbackColor) : resource(resource), color(fallbackColor), isValid(true), hasFallback(true) { ASSERT(resource); }
+
+        RenderSVGResource* resource;
+        Color color;
+        bool isValid;
+        bool hasFallback;
+    };
+    static PaintDescription requestPaint(RenderSVGResourceMode, const RenderObject&, const RenderStyle*);
 
     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