Hoist paint-server transform adaption out of preparePaintServer

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 57 matching lines @@
     } else {
         if (m_pattern)
             context.setStrokePattern(m_pattern);
         else if (m_gradient)
             context.setStrokeGradient(m_gradient);
         else
             context.setStrokeColor(m_color);
     }
 }
 
-SVGPaintServer SVGPaintServer::requestForRenderer(RenderObject& renderer, RenderStyle* style, RenderSVGResourceModeFlags resourceModeFlags)
+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)
 {
     ASSERT(style);
-    RenderSVGResourceMode resourceMode = static_cast<RenderSVGResourceMode>(resourceModeFlags & (ApplyToFillMode | ApplyToStrokeMode));
     ASSERT(resourceMode == ApplyToFillMode || resourceMode == ApplyToStrokeMode);
 
     bool hasFallback = false;
     RenderSVGResource* paintingResource = RenderSVGResource::requestPaintingResource(resourceMode, &renderer, style, hasFallback);
     if (!paintingResource)
         return invalid();
 
-    SVGPaintServer paintServer = paintingResource->preparePaintServer(&renderer, style, resourceModeFlags);
+    SVGPaintServer paintServer = paintingResource->preparePaintServer(&renderer);
     if (paintServer.isValid())
         return paintServer;
     if (hasFallback)
         return SVGPaintServer(RenderSVGResource::sharedSolidPaintingResource()->color());
     return invalid();
 }
 
-SVGPaintServer RenderSVGResource::preparePaintServer(RenderObject*, RenderStyle*, RenderSVGResourceModeFlags)
+SVGPaintServer RenderSVGResource::preparePaintServer(RenderObject*)
 {
     ASSERT_NOT_REACHED();
     return SVGPaintServer::invalid();
 }
 
 RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceMode mode, RenderObject* object, const RenderStyle* style, bool& hasFallback)
 {
     ASSERT(object);
     ASSERT(style);
 
@@ skipping 140 matching lines @@
             // This will process the rest of the ancestors.
             toRenderSVGResourceContainer(current)->removeAllClientsFromCache();
             break;
         }
 
         current = current->parent();
     }
 }
 
 }