ImageBuffer-less SVG masking and clipping.

Source/core/rendering/svg/SVGRenderingContext.h

Index: Source/core/rendering/svg/SVGRenderingContext.h
diff --git a/Source/core/rendering/svg/SVGRenderingContext.h b/Source/core/rendering/svg/SVGRenderingContext.h
index 830f0de19ac506ba6b1c55716d824fba6a2df093..3bc88c1e0eb16a3fd242643ba7c9af03efc7ddb4 100644
--- a/Source/core/rendering/svg/SVGRenderingContext.h
+++ b/Source/core/rendering/svg/SVGRenderingContext.h
@@ -33,7 +33,9 @@ namespace WebCore {
 class AffineTransform;
 class RenderObject;
 class FloatRect;
+class RenderSVGResourceClipper;
 class RenderSVGResourceFilter;
+class RenderSVGResourceMasker;
 
 // SVGRenderingContext
 class SVGRenderingContext {
@@ -50,6 +52,8 @@ public:
         , m_paintInfo(0)
         , m_savedContext(0)
         , m_filter(0)
+        , m_clipper(0)
+        , m_masker(0)
     {
     }
 
@@ -59,6 +63,8 @@ public:
         , m_paintInfo(0)
         , m_savedContext(0)
         , m_filter(0)
+        , m_clipper(0)
+        , m_masker(0)
     {
         prepareToRenderSVGContent(object, paintinfo, needsGraphicsContextSave);
     }
@@ -74,8 +80,7 @@ public:
     // Patterns need a different float-to-integer coordinate mapping.
     static bool createImageBufferForPattern(const FloatRect& absoluteTargetRect, const FloatRect& clampedAbsoluteTargetRect, OwnPtr<ImageBuffer>&, RenderingMode);
 
-    static void renderSubtreeToImageBuffer(ImageBuffer*, RenderObject*, const AffineTransform&);
-    static void clipToImageBuffer(GraphicsContext*, const AffineTransform& absoluteTransform, const FloatRect& targetRect, OwnPtr<ImageBuffer>&, bool safeToClear);
+    static void renderSubtree(GraphicsContext*, RenderObject*, const AffineTransform&);
 
     static float calculateScreenFontSizeScalingFactor(const RenderObject*);
     static void calculateTransformationToOutermostCoordinateSystem(const RenderObject*, AffineTransform& absoluteTransform);
@@ -97,12 +102,12 @@ private:
         RenderingPrepared = 1,
         RestoreGraphicsContext = 1 << 1,
         EndOpacityLayer = 1 << 2,
-        EndFilterLayer = 1 << 3,
+        PostApplyResources = 1 << 3,
         PrepareToRenderSVGContentWasCalled = 1 << 4
     };
 
     // List of those flags which require actions during the destructor.
-    const static int ActionsNeeded = RestoreGraphicsContext | EndOpacityLayer | EndFilterLayer;
+    const static int ActionsNeeded = RestoreGraphicsContext | EndOpacityLayer | PostApplyResources;
 
     int m_renderingFlags;
     RenderObject* m_object;
@@ -110,6 +115,8 @@ private:
     GraphicsContext* m_savedContext;
     IntRect m_savedPaintRect;
     RenderSVGResourceFilter* m_filter;
+    RenderSVGResourceClipper* m_clipper;
+    RenderSVGResourceMasker* m_masker;
 };
 
 } // namespace WebCore