Move RenderSVGResource into the inheritance hierarchy

Source/core/rendering/svg/RenderSVGResourcePaintServer.cpp

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
-#include "core/rendering/svg/RenderSVGResource.h"
+#include "core/rendering/svg/RenderSVGResourcePaintServer.h"
 
 #include "core/rendering/style/RenderStyle.h"
-#include "core/rendering/svg/RenderSVGResourceContainer.h"
 #include "core/rendering/svg/SVGResources.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 
 namespace blink {
 
 SVGPaintServer::SVGPaintServer(Color color)
     : m_color(color)
 {
@@ skipping 88 matching lines @@
         }
     }
 
     // If the primary resource is just a color, return immediately.
     if (paintType < SVG_PAINTTYPE_URI_NONE) {
         // |paintType| will be either <current-color> or <rgb-color> here - both of which will have a color.
         ASSERT(hasColor);
         return SVGPaintDescription(color);
     }
 
-    RenderSVGResource* uriResource = 0;
+    RenderSVGResourcePaintServer* uriResource = 0;
     if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(&object))
         uriResource = applyToFill ? resources->fill() : resources->stroke();
 
     // If the requested resource is not available, return the color resource or 'none'.
     if (!uriResource) {
         // The fallback is 'none'. (SVG2 say 'none' is implied when no fallback is specified.)
         if (paintType == SVG_PAINTTYPE_URI_NONE || !hasColor)
             return SVGPaintDescription();
 
         return SVGPaintDescription(color);
@@ skipping 24 matching lines @@
     if (paintDescription.hasFallback)
         return SVGPaintServer(paintDescription.color);
     return invalid();
 }
 
 bool SVGPaintServer::existsForRenderer(const RenderObject& renderer, const RenderStyle* style, RenderSVGResourceMode resourceMode)
 {
     return requestPaint(renderer, style, resourceMode).isValid;
 }
 
-SVGPaintServer RenderSVGResource::preparePaintServer(const RenderObject&)
+RenderSVGResourcePaintServer::RenderSVGResourcePaintServer(SVGElement* element)
+    : RenderSVGResourceContainer(element)
 {
-    ASSERT_NOT_REACHED();
-    return SVGPaintServer::invalid();
 }
 
-SVGPaintDescription RenderSVGResource::requestPaintDescription(const RenderObject& renderer, const RenderStyle* style, RenderSVGResourceMode resourceMode)
+RenderSVGResourcePaintServer::~RenderSVGResourcePaintServer()
+{
+}
+
+SVGPaintDescription RenderSVGResourcePaintServer::requestPaintDescription(const RenderObject& renderer, const RenderStyle* style, RenderSVGResourceMode resourceMode)
 {
     return requestPaint(renderer, style, resourceMode);
 }
 
 }