Move RenderSVGResource into the inheritance hierarchy

Source/core/rendering/svg/SVGResources.h

 /*
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 16 matching lines @@
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 class RenderObject;
 class RenderSVGResourceClipper;
 class RenderSVGResourceContainer;
 class RenderSVGResourceFilter;
 class RenderSVGResourceMarker;
 class RenderSVGResourceMasker;
+class RenderSVGResourcePaintServer;
 class SVGElement;
 class SVGRenderStyle;
 
 // Holds a set of resources associated with a RenderObject
 class SVGResources {
     WTF_MAKE_NONCOPYABLE(SVGResources); WTF_MAKE_FAST_ALLOCATED;
 public:
     SVGResources();
 
     static PassOwnPtr<SVGResources> buildResources(const RenderObject*, const SVGRenderStyle&);
     void layoutIfNeeded();
 
     static bool supportsMarkers(const SVGElement&);
 
     // Ordinary resources
     RenderSVGResourceClipper* clipper() const { return m_clipperFilterMaskerData ? m_clipperFilterMaskerData->clipper : 0; }
     RenderSVGResourceMarker* markerStart() const { return m_markerData ? m_markerData->markerStart : 0; }
     RenderSVGResourceMarker* markerMid() const { return m_markerData ? m_markerData->markerMid : 0; }
     RenderSVGResourceMarker* markerEnd() const { return m_markerData ? m_markerData->markerEnd : 0; }
     RenderSVGResourceMasker* masker() const { return m_clipperFilterMaskerData ? m_clipperFilterMaskerData->masker : 0; }
 
     RenderSVGResourceFilter* filter() const
     {
         if (m_clipperFilterMaskerData)
             return m_clipperFilterMaskerData->filter;
         return 0;
     }
 
     // Paint servers
-    RenderSVGResourceContainer* fill() const { return m_fillStrokeData ? m_fillStrokeData->fill : 0; }
-    RenderSVGResourceContainer* stroke() const { return m_fillStrokeData ? m_fillStrokeData->stroke : 0; }
+    RenderSVGResourcePaintServer* fill() const { return m_fillStrokeData ? m_fillStrokeData->fill : 0; }
+    RenderSVGResourcePaintServer* stroke() const { return m_fillStrokeData ? m_fillStrokeData->stroke : 0; }
 
     // Chainable resources - linked through xlink:href
     RenderSVGResourceContainer* linkedResource() const { return m_linkedResource; }
 
     void buildSetOfResources(HashSet<RenderSVGResourceContainer*>&);
 
     // Methods operating on all cached resources
     void removeClientFromCache(RenderObject*, bool markForInvalidation = true) const;
     void resourceDestroyed(RenderSVGResourceContainer*);
 
@@ skipping 16 matching lines @@
     void resetFill();
     void resetStroke();
     void resetLinkedResource();
 
     bool setClipper(RenderSVGResourceClipper*);
     bool setFilter(RenderSVGResourceFilter*);
     bool setMarkerStart(RenderSVGResourceMarker*);
     bool setMarkerMid(RenderSVGResourceMarker*);
     bool setMarkerEnd(RenderSVGResourceMarker*);
     bool setMasker(RenderSVGResourceMasker*);
-    bool setFill(RenderSVGResourceContainer*);
-    bool setStroke(RenderSVGResourceContainer*);
+    bool setFill(RenderSVGResourcePaintServer*);
+    bool setStroke(RenderSVGResourcePaintServer*);
     bool setLinkedResource(RenderSVGResourceContainer*);
 
     // From SVG 1.1 2nd Edition
     // clipper: 'container elements' and 'graphics elements'
     // filter:  'container elements' and 'graphics elements'
     // masker:  'container elements' and 'graphics elements'
     // -> a, circle, defs, ellipse, glyph, g, image, line, marker, mask, missing-glyph, path, pattern, polygon, polyline, rect, svg, switch, symbol, text, use
     struct ClipperFilterMaskerData {
         WTF_MAKE_FAST_ALLOCATED;
     public:
@@ skipping 47 matching lines @@
             : fill(0)
             , stroke(0)
         {
         }
 
         static PassOwnPtr<FillStrokeData> create()
         {
             return adoptPtr(new FillStrokeData);
         }
 
-        RenderSVGResourceContainer* fill;
-        RenderSVGResourceContainer* stroke;
+        RenderSVGResourcePaintServer* fill;
+        RenderSVGResourcePaintServer* stroke;
     };
 
     OwnPtr<ClipperFilterMaskerData> m_clipperFilterMaskerData;
     OwnPtr<MarkerData> m_markerData;
     OwnPtr<FillStrokeData> m_fillStrokeData;
     RenderSVGResourceContainer* m_linkedResource;
 };
 
 }
 
 #endif