Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / canvas / CanvasRenderingContext2D.h

diff --git a/src/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h b/src/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h
index bdf5914..90b1fc7 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h
+++ b/src/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext2D.h
@@ -91,12 +91,9 @@ public:
 
     const Vector<float>& getLineDash() const;
     void setLineDash(const Vector<float>&);
-    void setWebkitLineDash(const Vector<float>&);
 
     float lineDashOffset() const;
     void setLineDashOffset(float);
-    float webkitLineDashOffset() const;
-    void setWebkitLineDashOffset(float);
 
     float shadowOffsetX() const;
     void setShadowOffsetX(float);
@@ -116,7 +113,7 @@ public:
     String globalCompositeOperation() const;
     void setGlobalCompositeOperation(const String&);
 
-    void save() { ++m_unrealizedSaveCount; }
+    void save() { ++m_stateStack.last().m_unrealizedSaveCount; }
     void restore();
 
     SVGMatrix currentTransform() const
@@ -251,6 +248,8 @@ private:
         // CSSFontSelectorClient implementation
         virtual void fontsNeedUpdate(CSSFontSelector*) OVERRIDE;
 
+        unsigned m_unrealizedSaveCount;
+
         String m_unparsedStrokeColor;
         String m_unparsedFillColor;
         RefPtr<CanvasStyle> m_strokeStyle;
@@ -282,7 +281,7 @@ private:
 
     CanvasRenderingContext2D(HTMLCanvasElement*, const Canvas2DContextAttributes* attrs, bool usesCSSCompatibilityParseMode);
 
-    State& modifiableState() { ASSERT(!m_unrealizedSaveCount); return m_stateStack.last(); }
+    State& modifiableState() { ASSERT(!state().m_unrealizedSaveCount); return m_stateStack.last(); }
     const State& state() const { return m_stateStack.last(); }
 
     void applyLineDash() const;
@@ -298,12 +297,7 @@ private:
     GraphicsContext* drawingContext() const;
 
     void unwindStateStack();
-    void realizeSaves()
-    {
-        if (m_unrealizedSaveCount)
-            realizeSavesLoop();
-    }
-    void realizeSavesLoop();
+    void realizeSaves();
 
     void applyStrokePattern();
     void applyFillPattern();
@@ -333,7 +327,6 @@ private:
     virtual blink::WebLayer* platformLayer() const OVERRIDE;
 
     Vector<State, 1> m_stateStack;
-    unsigned m_unrealizedSaveCount;
     bool m_usesCSSCompatibilityParseMode;
     bool m_hasAlpha;
     MutableStylePropertyMap m_fetchedFonts;