Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / svg / SVGRenderingContext.h

diff --git a/src/third_party/WebKit/Source/core/rendering/svg/SVGRenderingContext.h b/src/third_party/WebKit/Source/core/rendering/svg/SVGRenderingContext.h
index 151c56a..f1d4c73 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/svg/SVGRenderingContext.h
+++ b/src/third_party/WebKit/Source/core/rendering/svg/SVGRenderingContext.h
@@ -40,11 +40,6 @@ class RenderSVGResourceMasker;
 // SVGRenderingContext
 class SVGRenderingContext {
 public:
-    enum NeedsGraphicsContextSave {
-        SaveGraphicsContext,
-        DontSaveGraphicsContext,
-    };
-
     // Does not start rendering.
     SVGRenderingContext()
         : m_renderingFlags(0)
@@ -53,27 +48,29 @@ public:
         , m_savedContext(0)
         , m_filter(0)
         , m_clipper(0)
+        , m_clipperState(RenderSVGResourceClipper::ClipperNotApplied)
         , m_masker(0)
     {
     }
 
-    SVGRenderingContext(RenderObject* object, PaintInfo& paintinfo, NeedsGraphicsContextSave needsGraphicsContextSave = DontSaveGraphicsContext)
+    SVGRenderingContext(RenderObject* object, PaintInfo& paintinfo)
         : m_renderingFlags(0)
         , m_object(0)
         , m_paintInfo(0)
         , m_savedContext(0)
         , m_filter(0)
         , m_clipper(0)
+        , m_clipperState(RenderSVGResourceClipper::ClipperNotApplied)
         , m_masker(0)
     {
-        prepareToRenderSVGContent(object, paintinfo, needsGraphicsContextSave);
+        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&, NeedsGraphicsContextSave = DontSaveGraphicsContext);
+    void prepareToRenderSVGContent(RenderObject*, PaintInfo&);
     bool isRenderingPrepared() const { return m_renderingFlags & RenderingPrepared; }
 
     static void renderSubtree(GraphicsContext*, RenderObject*, const AffineTransform&);
@@ -111,7 +108,7 @@ private:
     IntRect m_savedPaintRect;
     RenderSVGResourceFilter* m_filter;
     RenderSVGResourceClipper* m_clipper;
-    ClipperContext m_clipperContext;
+    RenderSVGResourceClipper::ClipperState m_clipperState;
     RenderSVGResourceMasker* m_masker;
 };