Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8

1 files changed, 98 insertions, 63 deletions

diff --git a/WebCore/svg/SVGPathSegCurvetoCubic.h b/WebCore/svg/SVGPathSegCurvetoCubic.h
index ae4a21d..169d8f8 100644
--- a/WebCore/svg/SVGPathSegCurvetoCubic.h
+++ b/WebCore/svg/SVGPathSegCurvetoCubic.h
@@ -22,74 +22,109 @@
 #define SVGPathSegCurvetoCubic_h
 
 #if ENABLE(SVG)
-
-#include "PlatformString.h"
-#include "SVGPathSeg.h"
+#include "SVGPathSegWithContext.h"
 
 namespace WebCore {
 
-    class SVGPathSegCurvetoCubic : public SVGPathSeg { 
-    public:
-        SVGPathSegCurvetoCubic(float x, float y, float x1, float y1, float x2, float y2) : m_x(x), m_y(y), m_x1(x1), m_y1(y1), m_x2(x2), m_y2(y2) { }
-
-        void setX(float x) { m_x = x; }
-        float x() const { return m_x; }
-
-        void setY(float y) { m_y = y; }
-        float y() const { return m_y; }
-
-        void setX1(float x1) { m_x1 = x1; }
-        float x1() const { return m_x1; }
-
-        void setY1(float y1) { m_y1 = y1; }
-        float y1() const { return m_y1; }
-
-        void setX2(float x2) { m_x2 = x2; }
-        float x2() const { return m_x2; }
-
-        void setY2(float y2) { m_y2 = y2; }
-        float y2() const { return m_y2; }
-
-    private:
-        float m_x;
-        float m_y;
-        float m_x1;
-        float m_y1;
-        float m_x2;
-        float m_y2;
-    };
-
-    class SVGPathSegCurvetoCubicAbs : public SVGPathSegCurvetoCubic { 
-    public:
-        static PassRefPtr<SVGPathSegCurvetoCubicAbs> create(float x, float y, float x1, float y1, float x2, float y2)
-        {
-            return adoptRef(new SVGPathSegCurvetoCubicAbs(x, y, x1, y1, x2, y2));
-        }
-
-    private:
-        SVGPathSegCurvetoCubicAbs(float x, float y, float x1, float y1, float x2, float y2);
-
-        virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_ABS; }
-        virtual String pathSegTypeAsLetter() const { return "C"; }
-    };
-
-    class SVGPathSegCurvetoCubicRel : public SVGPathSegCurvetoCubic { 
-    public:
-        static PassRefPtr<SVGPathSegCurvetoCubicRel> create(float x, float y, float x1, float y1, float x2, float y2)
-        {
-            return adoptRef(new SVGPathSegCurvetoCubicRel(x, y, x1, y1, x2, y2));
-        }
-
-    private:
-        SVGPathSegCurvetoCubicRel(float x, float y, float x1, float y1, float x2, float y2);
-
-        virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_REL; }
-        virtual String pathSegTypeAsLetter() const { return "c"; }
-    };
+class SVGPathSegCurvetoCubic : public SVGPathSegWithContext { 
+public:
+    SVGPathSegCurvetoCubic(SVGPathElement* element, SVGPathSegRole role, float x, float y, float x1, float y1, float x2, float y2)
+        : SVGPathSegWithContext(element, role)
+        , m_x(x)
+        , m_y(y)
+        , m_x1(x1)
+        , m_y1(y1)
+        , m_x2(x2)
+        , m_y2(y2)
+    {
+    }
+
+    float x() const { return m_x; }
+    void setX(float x)
+    {
+        m_x = x;
+        commitChange();
+    }
+
+    float y() const { return m_y; }
+    void setY(float y)
+    {
+        m_y = y;
+        commitChange();
+    }
+
+    float x1() const { return m_x1; }
+    void setX1(float x1)
+    {
+        m_x1 = x1;
+        commitChange();
+    }
+
+    float y1() const { return m_y1; }
+    void setY1(float y1)
+    {
+        m_y1 = y1;
+        commitChange();
+    }
+
+    float x2() const { return m_x2; }
+    void setX2(float x2)
+    {
+        m_x2 = x2;
+        commitChange();
+    }
+
+    float y2() const { return m_y2; }
+    void setY2(float y2)
+    {
+        m_y2 = y2;
+        commitChange();
+    }
+
+private:
+    float m_x;
+    float m_y;
+    float m_x1;
+    float m_y1;
+    float m_x2;
+    float m_y2;
+};
+
+class SVGPathSegCurvetoCubicAbs : public SVGPathSegCurvetoCubic { 
+public:
+    static PassRefPtr<SVGPathSegCurvetoCubicAbs> create(SVGPathElement* element, SVGPathSegRole role, float x, float y, float x1, float y1, float x2, float y2)
+    {
+        return adoptRef(new SVGPathSegCurvetoCubicAbs(element, role, x, y, x1, y1, x2, y2));
+    }
+
+private:
+    SVGPathSegCurvetoCubicAbs(SVGPathElement* element, SVGPathSegRole role, float x, float y, float x1, float y1, float x2, float y2)
+        : SVGPathSegCurvetoCubic(element, role, x, y, x1, y1, x2, y2)
+    {
+    }
+
+    virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_ABS; }
+    virtual String pathSegTypeAsLetter() const { return "C"; }
+};
+
+class SVGPathSegCurvetoCubicRel : public SVGPathSegCurvetoCubic { 
+public:
+    static PassRefPtr<SVGPathSegCurvetoCubicRel> create(SVGPathElement* element, SVGPathSegRole role, float x, float y, float x1, float y1, float x2, float y2)
+    {
+        return adoptRef(new SVGPathSegCurvetoCubicRel(element, role, x, y, x1, y1, x2, y2));
+    }
+
+private:
+    SVGPathSegCurvetoCubicRel(SVGPathElement* element, SVGPathSegRole role, float x, float y, float x1, float y1, float x2, float y2)
+        : SVGPathSegCurvetoCubic(element, role, x, y, x1, y1, x2, y2)
+    {
+    }
+
+    virtual unsigned short pathSegType() const { return PATHSEG_CURVETO_CUBIC_REL; }
+    virtual String pathSegTypeAsLetter() const { return "c"; }
+};
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG)
 #endif
-
-// vim:ts=4:noet