Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8

1 files changed, 30 insertions, 21 deletions

diff --git a/WebCore/svg/SVGPathSegMoveto.h b/WebCore/svg/SVGPathSegMoveto.h
index edaff4b..87fcd7d 100644
--- a/WebCore/svg/SVGPathSegMoveto.h
+++ b/WebCore/svg/SVGPathSegMoveto.h
@@ -22,36 +22,45 @@
 #define SVGPathSegMoveto_h
 
 #if ENABLE(SVG)
-
-#include "PlatformString.h"
-#include "SVGPathSeg.h"
+#include "SVGPathSegWithContext.h"
 
 namespace WebCore {
-    class SVGPathSegMovetoAbs : public SVGPathSegSingleCoord { 
-    public:
-        static PassRefPtr<SVGPathSegMovetoAbs> create(float x, float y) { return adoptRef(new SVGPathSegMovetoAbs(x, y)); }
 
-    private:
-        SVGPathSegMovetoAbs(float x, float y);
+class SVGPathSegMovetoAbs : public SVGPathSegSingleCoordinate { 
+public:
+    static PassRefPtr<SVGPathSegMovetoAbs> create(SVGPathElement* element, SVGPathSegRole role, float x, float y)
+    {
+        return adoptRef(new SVGPathSegMovetoAbs(element, role, x, y));
+    }
+
+private:
+    SVGPathSegMovetoAbs(SVGPathElement* element, SVGPathSegRole role, float x, float y)
+        : SVGPathSegSingleCoordinate(element, role, x, y)
+    {
+    }
 
-        virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_ABS; }
-        virtual String pathSegTypeAsLetter() const { return "M"; }
-    };
+    virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_ABS; }
+    virtual String pathSegTypeAsLetter() const { return "M"; }
+};
 
-    class SVGPathSegMovetoRel : public SVGPathSegSingleCoord { 
-    public:
-        static PassRefPtr<SVGPathSegMovetoRel> create(float x, float y) { return adoptRef(new SVGPathSegMovetoRel(x, y)); }
+class SVGPathSegMovetoRel : public SVGPathSegSingleCoordinate { 
+public:
+    static PassRefPtr<SVGPathSegMovetoRel> create(SVGPathElement* element, SVGPathSegRole role, float x, float y)
+    {
+        return adoptRef(new SVGPathSegMovetoRel(element, role, x, y));
+    }
 
-    private:
-        SVGPathSegMovetoRel(float x, float y);
+private:
+    SVGPathSegMovetoRel(SVGPathElement* element, SVGPathSegRole role, float x, float y)
+        : SVGPathSegSingleCoordinate(element, role, x, y)
+    {
+    }
 
-        virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_REL; }
-        virtual String pathSegTypeAsLetter() const { return "m"; }
-    };
+    virtual unsigned short pathSegType() const { return PATHSEG_MOVETO_REL; }
+    virtual String pathSegTypeAsLetter() const { return "m"; }
+};
 
 } // namespace WebCore
 
 #endif // ENABLE(SVG)
 #endif
-
-// vim:ts=4:noet