Pass more const RenderObject& in the vicinity of paint-servers

Source/core/rendering/svg/RenderSVGResource.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 66 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());
 }
 
-SVGPaintServer SVGPaintServer::requestForRenderer(RenderObject& renderer, RenderStyle* style, RenderSVGResourceMode resourceMode)
+SVGPaintServer SVGPaintServer::requestForRenderer(const RenderObject& renderer, const RenderStyle* style, RenderSVGResourceMode resourceMode)
 {
     ASSERT(style);
     ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
 
     bool hasFallback = false;
-    RenderSVGResource* paintingResource = RenderSVGResource::requestPaintingResource(resourceMode, &renderer, style, hasFallback);
+    RenderSVGResource* paintingResource = RenderSVGResource::requestPaintingResource(resourceMode, renderer, style, hasFallback);
     if (!paintingResource)
         return invalid();
 
-    SVGPaintServer paintServer = paintingResource->preparePaintServer(&renderer);
+    SVGPaintServer paintServer = paintingResource->preparePaintServer(renderer);
     if (paintServer.isValid())
         return paintServer;
     if (hasFallback)
         return SVGPaintServer(RenderSVGResource::sharedSolidPaintingResource()->color());
     return invalid();
 }
 
-SVGPaintServer RenderSVGResource::preparePaintServer(RenderObject*)
+SVGPaintServer RenderSVGResource::preparePaintServer(const RenderObject&)
 {
     ASSERT_NOT_REACHED();
     return SVGPaintServer::invalid();
 }
 
-RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceMode mode, RenderObject* object, const RenderStyle* style, bool& hasFallback)
+RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceMode mode, const RenderObject& object, const RenderStyle* style, bool& hasFallback)
 {
-    ASSERT(object);
     ASSERT(style);
 
     hasFallback = false;
 
     // 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())
@@ skipping 35 matching lines @@
     // If the primary resource is just a color, return immediately.
     RenderSVGResourceSolidColor* colorResource = RenderSVGResource::sharedSolidPaintingResource();
     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);
         colorResource->setColor(color);
         return colorResource;
     }
 
     RenderSVGResource* uriResource = 0;
-    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object))
+    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 0;
 
         colorResource->setColor(color);
         return colorResource;
@@ skipping 76 matching lines @@
             // This will process the rest of the ancestors.
             toRenderSVGResourceContainer(current)->removeAllClientsFromCache();
             break;
         }
 
         current = current->parent();
     }
 }
 
 }