Move rendering/RenderObject to layout/LayoutObject.

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.
@@ skipping 63 matching lines @@
 
 void SVGPaintServer::prependTransform(const AffineTransform& transform)
 {
     ASSERT(m_gradient || m_pattern);
     if (m_pattern)
         m_pattern->setPatternSpaceTransform(transform * m_pattern->patternSpaceTransform());
     else
         m_gradient->setGradientSpaceTransform(transform * m_gradient->gradientSpaceTransform());
 }
 
-static SVGPaintDescription requestPaint(const RenderObject& object, const RenderStyle& style, RenderSVGResourceMode mode)
+static SVGPaintDescription requestPaint(const LayoutObject& object, const RenderStyle& style, RenderSVGResourceMode mode)
 {
     // If we have no style at all, ignore it.
     const SVGRenderStyle& svgStyle = style.svgStyle();
 
     // If we have no fill/stroke, return 0.
     if (mode == ApplyToFillMode) {
         if (!svgStyle.hasFill())
             return SVGPaintDescription();
     } else {
         if (!svgStyle.hasStroke())
@@ skipping 30 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);
     }
 
     RenderSVGResourcePaintServer* uriResource = 0;
-    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(&object))
+    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForLayoutObject(&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);
     }
 
     // The paint server resource exists, though it may be invalid (pattern with width/height=0).
     // Return the fallback color to our caller so it can use it, if
     // preparePaintServer() on the resource container failed.
     if (hasColor)
         return SVGPaintDescription(uriResource, color);
 
     return SVGPaintDescription(uriResource);
 }
 
-SVGPaintServer SVGPaintServer::requestForRenderer(const RenderObject& renderer, const RenderStyle& style, RenderSVGResourceMode resourceMode)
+SVGPaintServer SVGPaintServer::requestForRenderer(const LayoutObject& renderer, const RenderStyle& style, RenderSVGResourceMode resourceMode)
 {
     ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
 
     SVGPaintDescription paintDescription = requestPaint(renderer, style, resourceMode);
     if (!paintDescription.isValid)
         return invalid();
     if (!paintDescription.resource)
         return SVGPaintServer(paintDescription.color);
     SVGPaintServer paintServer = paintDescription.resource->preparePaintServer(renderer);
     if (paintServer.isValid())
         return paintServer;
     if (paintDescription.hasFallback)
         return SVGPaintServer(paintDescription.color);
     return invalid();
 }
 
-bool SVGPaintServer::existsForRenderer(const RenderObject& renderer, const RenderStyle& style, RenderSVGResourceMode resourceMode)
+bool SVGPaintServer::existsForRenderer(const LayoutObject& renderer, const RenderStyle& style, RenderSVGResourceMode resourceMode)
 {
     return requestPaint(renderer, style, resourceMode).isValid;
 }
 
 RenderSVGResourcePaintServer::RenderSVGResourcePaintServer(SVGElement* element)
     : RenderSVGResourceContainer(element)
 {
 }
 
 RenderSVGResourcePaintServer::~RenderSVGResourcePaintServer()
 {
 }
 
-SVGPaintDescription RenderSVGResourcePaintServer::requestPaintDescription(const RenderObject& renderer, const RenderStyle& style, RenderSVGResourceMode resourceMode)
+SVGPaintDescription RenderSVGResourcePaintServer::requestPaintDescription(const LayoutObject& renderer, const RenderStyle& style, RenderSVGResourceMode resourceMode)
 {
     return requestPaint(renderer, style, resourceMode);
 }
 
 }