Decouple content transform fiddling from SVGRenderingContext::renderSubtree

Source/core/rendering/svg/SVGRenderingContext.h

 /**
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2012 Zoltan Herczeg <zherczeg@webkit.org>.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 10 matching lines @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SVGRenderingContext_h
 #define SVGRenderingContext_h
 
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/svg/RenderSVGResourceClipper.h"
 #include "platform/graphics/ImageBuffer.h"
+#include "platform/transforms/AffineTransform.h"
 
 namespace blink {
 
-class AffineTransform;
 class RenderObject;
 class FloatRect;
 class RenderSVGResourceFilter;
 class RenderSVGResourceMasker;
 
+class SubtreeContentTransformScope {
+public:
+    SubtreeContentTransformScope(const AffineTransform&);
+    ~SubtreeContentTransformScope();
+
+private:
+    AffineTransform m_savedContentTransformation;
+};
+
 // SVGRenderingContext
 class SVGRenderingContext {
 public:
     // Does not start rendering.
     SVGRenderingContext()
         : m_renderingFlags(0)
         , m_object(0)
         , m_paintInfo(0)
         , m_savedContext(0)
         , m_filter(0)
@@ skipping 16 matching lines @@
         prepareToRenderSVGContent(object, paintinfo);
     }
 
     // Automatically finishes context rendering.
     ~SVGRenderingContext();
 
     // Used by all SVG renderers who apply clip/filter/etc. resources to the renderer content.
     void prepareToRenderSVGContent(RenderObject*, PaintInfo&);
     bool isRenderingPrepared() const { return m_renderingFlags & RenderingPrepared; }
 
-    static void renderSubtree(GraphicsContext*, RenderObject*, const AffineTransform&);
+    static void renderSubtree(GraphicsContext*, RenderObject*);
 
     static float calculateScreenFontSizeScalingFactor(const RenderObject*);
     static void calculateDeviceSpaceTransformation(const RenderObject*, AffineTransform& absoluteTransform);
     static FloatRect clampedAbsoluteTargetRect(const FloatRect& absoluteTargetRect);
     static void clear2DRotation(AffineTransform&);
 
     // Support for the buffered-rendering hint.
     bool bufferForeground(OwnPtr<ImageBuffer>&);
 
 private:
@@ skipping 16 matching lines @@
     IntRect m_savedPaintRect;
     RenderSVGResourceFilter* m_filter;
     RenderSVGResourceClipper* m_clipper;
     RenderSVGResourceClipper::ClipperState m_clipperState;
     RenderSVGResourceMasker* m_masker;
 };
 
 } // namespace blink
 
 #endif // SVGRenderingContext_h