SVGPathSegXXXインターフェースを排除し、オブジェクトリテラルをかわりに使う

diff --git a/org/w3c/dom/svg.js b/org/w3c/dom/svg.js
index 4f35d34..031fc62 100644 (file)
--- a/org/w3c/dom/svg.js
+++ b/org/w3c/dom/svg.js
@@ -2413,94 +2413,8 @@ function SVGPathSeg() {
   /*unsigned short t.PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL = 19;\r
 })(SVGPathSeg);*/\r
 /*SVGPathSegxx\r
- *軽量化のために、SVGPathSegの継承をしない。\r
- */\r
-base("$SVGPathSegClosePath").mix( {\r
-  pathSegType : /*SVGPathSeg.PATHSEG_CLOSEPATH*/ 1,\r
-  pathSegTypeAsLetter : "z"\r
-} );\r
-\r
-base("$SVGPathSegMovetoAbs").mix( {\r
-  /*float*/ x: 0,\r
-  /*float*/ y: 0,\r
-  pathSegType : /*SVGPathSeg.PATHSEG_MOVETO_ABS*/ 2,\r
-  pathSegTypeAsLetter : "M"\r
-} ).mix( function(_) {\r
-  \r
-  _.up("$SVGPathSegMovetoRel").mix( {\r
-    pathSegType : /*SVGPathSeg.PATHSEG_MOVETO_REL*/ 3,\r
-    pathSegTypeAsLetter : "m"\r
-  } );\r
-\r
-  _.up("$SVGPathSegLinetoAbs").mix( {\r
-    pathSegType : /*SVGPathSeg.PATHSEG_LINETO_ABS*/ 4,\r
-   pathSegTypeAsLetter : "L"\r
-  } );\r
-\r
-  _.up("$SVGPathSegLinetoRel").mix( {\r
-    pathSegType : /*SVGPathSeg.PATHSEG_LINETO_REL*/ 5,\r
-    pathSegTypeAsLetter : "l"\r
-  } );\r
-  \r
-} );\r
-\r
-base("$SVGPathSegCurvetoCubicAbs").mix( {\r
-  /*float*/x: 0,\r
-  /*float*/ y: 0,\r
-  /*float*/ x1: 0,\r
-  /*float*/ y1: 0,\r
-  /*float*/ x2: 0,\r
-  /*float*/ y2: 0,\r
-  pathSegType : /*SVGPathSeg.PATHSEG_CURVETO_CUBIC_ABS*/ 6,\r
-  pathSegTypeAsLetter : "C"\r
-} ).mix( function(_) {\r
-  \r
-  _.up("$SVGPathSegCurvetoCubicRel").mix( {\r
-    pathSegType : /*SVGPathSeg.PATHSEG_CURVETO_CUBIC_REL*/ 7,\r
-    pathSegTypeAsLetter : "c"\r
-  } );\r
-  \r
-  _.up("$SVGPathSegCurvetoQuadraticAbs").mix( {\r
-    pathSegType: /*SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_ABS*/ 8,\r
-    pathSegTypeAsLetter: "Q"\r
-  } );\r
-  \r
-  _.up("$SVGPathSegCurvetoQuadraticRel").mix( {\r
-    pathSegType: /*SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_REL*/ 9,\r
-   pathSegTypeAsLetter: "q"\r
-  } );\r
-  \r
-  _.up("$SVGPathSegArcAbs").mix( {\r
-    /*float this.x;\r
-    /*float this.y;\r
-    /*float this.r1;\r
-    /*float this.r2;\r
-    /*float this.angle;*/\r
-    /*boolean*/ largeArcFlag : true,\r
-    /*boolean*/ sweepFlag : true,\r
-    pathSegType : /*SVGPathSeg.PATHSEG_ARC_ABS*/ 10,\r
-    pathSegTypeAsLetter : "A"\r
-  } );\r
-  _.up("$SVGPathSegArcRel").mix( {\r
-    /*float this.x;\r
-    /*float this.y;\r
-    /*float this.r1;\r
-    /*float this.r2;\r
-    /*float this.angle;*/\r
-    /*boolean*/ largeArcFlag : true,\r
-    /*boolean*/ sweepFlag : true,\r
-    pathSegType : /*SVGPathSeg.PATHSEG_ARC_REL*/ 11,\r
-    pathSegTypeAsLetter : "a"\r
-  } );\r
-  /*SVGPathSegLinetoHorizontalAbsは$SVGPathElementのファクトリーメソッドで実装\r
-   * SVGPathSegLinetoHorizontalRel\r
-   * SVGPathSegLinetoVerticalAbs\r
-   * SVGPathSegLinetoVerticalRel\r
-   SVGPathSegCurvetoCubicSmoothAbs\r
-   SVGPathSegCurvetoCubicSmoothRel\r
-   SVGPathSegCurvetoQuadraticSmoothAbs\r
-   SVGPathSegCurvetoQuadraticSmoothRelも同様*/\r
-} );\r
+ *軽量化のために、SVGPathSegの実装をしない。\r
+ $SVGPathElementのファクトリーメソッドで実装*/\r
 \r
 /*documentは引数の変数として登録しておく*/\r
 (function(_doc, _math) {\r
@@ -3183,89 +3097,112 @@ _com: {
     return (nl.numberOfItems - 1);\r
   },\r
   /*SVGPathSegClosePath*/    createSVGPathSegClosePath: function() {\r
-    return base("$SVGPathSegClosePath").up();\r
+    return {\r
+      pathSegType : /*SVGPathSeg.PATHSEG_CLOSEPATH*/ 1,\r
+      pathSegTypeAsLetter : "z"\r
+    };\r
   },\r
   /*SVGPathSegMovetoAbs*/    createSVGPathSegMovetoAbs: function(/*float*/ x, /*float*/ y ) {\r
-    var s = base("$SVGPathSegMovetoAbs").up();\r
-    s.x = x;\r
-    s.y = y;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_MOVETO_ABS*/ 2,\r
+      pathSegTypeAsLetter : "M"\r
+    };\r
   },\r
   /*SVGPathSegMovetoRel*/    createSVGPathSegMovetoRel: function(/*float*/ x, /*float*/ y ) {\r
-    var s = base("$SVGPathSegMovetoAbs").$SVGPathSegMovetoRel.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_MOVETO_REL*/ 3,\r
+      pathSegTypeAsLetter : "m"\r
+    };\r
   },\r
   /*SVGPathSegLinetoAbs*/    createSVGPathSegLinetoAbs: function(/*float*/ x, /*float*/ y ) {\r
-    var s = base("$SVGPathSegMovetoAbs").$SVGPathSegLinetoAbs.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_LINETO_ABS*/ 4,\r
+      pathSegTypeAsLetter : "L"\r
+    };\r
   },\r
   /*SVGPathSegLinetoRel*/    createSVGPathSegLinetoRel: function(/*float*/ x, /*float*/ y ) {\r
-    var s = base("$SVGPathSegMovetoAbs").$SVGPathSegLinetoRel.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_LINETO_REL*/ 5,\r
+      pathSegTypeAsLetter : "l"\r
+      };\r
   },\r
   /*SVGPathSegCurvetoCubicAbs*/    createSVGPathSegCurvetoCubicAbs: function(/*float*/ x, /*float*/ y, /*float*/ x1, /*float*/ y1, /*float*/ x2, /*float*/ y2 ) {\r
-    var s = base("$SVGPathSegCurvetoCubicAbs").up();\r
-    s.x = x;\r
-    s.y = y;\r
-    s.x1 = x1;\r
-    s.y1 = y1;\r
-    s.x2 = x2;\r
-    s.y2 = y2;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      x1: x1,\r
+      y1: y1,\r
+      x2: x2,\r
+      y2: y2,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_CURVETO_CUBIC_ABS*/ 6,\r
+      pathSegTypeAsLetter : "C"\r
+    };\r
   },\r
   /*SVGPathSegCurvetoCubicRel*/    createSVGPathSegCurvetoCubicRel: function(/*float*/ x, /*float*/ y, /*float*/ x1, /*float*/ y1, /*float*/ x2, /*float*/ y2 ) {\r
-    var s = base("$SVGPathSegCurvetoCubicAbs").$SVGPathSegCurvetoCubicRel.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    s.x1 = x1;\r
-    s.y1 = y1;\r
-    s.x2 = x2;\r
-    s.y2 = y2;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      x1: x1,\r
+      y1: y1,\r
+      x2: x2,\r
+      y2: y2,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_CURVETO_CUBIC_REL*/ 7,\r
+      pathSegTypeAsLetter : "c"\r
+    };\r
   },\r
   /*SVGPathSegCurvetoQuadraticAbs*/    createSVGPathSegCurvetoQuadraticAbs: function(/*float*/ x, /*float*/ y, /*float*/ x1, /*float*/ y1 ) {\r
-    var s = base("$SVGPathSegCurvetoCubicAbs").$SVGPathSegCurvetoQuadraticAbs.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    s.x1 = x1;\r
-    s.y1 = y1;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      x1: x1,\r
+      y1: y1,\r
+      pathSegType: /*SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_ABS*/ 8,\r
+      pathSegTypeAsLetter: "Q"\r
+    };\r
   },\r
   /*SVGPathSegCurvetoQuadraticRel*/    createSVGPathSegCurvetoQuadraticRel: function(/*float*/ x, /*float*/ y, /*float*/ x1, /*float*/ y1 ) {\r
-    var s = base("$SVGPathSegCurvetoCubicAbs").$SVGPathSegCurvetoQuadraticRel.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    s.x1 = x1;\r
-    s.y1 = y1;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      x1: x1,\r
+      y1: y1,\r
+      pathSegType: /*SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_REL*/ 9,\r
+      pathSegTypeAsLetter: "q"\r
+    };\r
   },\r
   /*SVGPathSegArcAbs*/    createSVGPathSegArcAbs: function(/*float*/ x, /*float*/ y, /*float*/ r1, /*float*/ r2, /*float*/ angle, /*boolean*/ largeArcFlag, /*boolean*/ sweepFlag ) {\r
-    var s = base("$SVGPathSegCurvetoCubicAbs").$SVGPathSegArcAbs.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    s.r1 = r1;\r
-    s.r2 = r2;\r
-    s.angle = angle;\r
-    s.largeArcFlag = largeArcFlag;\r
-    s.sweepFlag = sweepFlag;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      r1: r1,\r
+      r2: r2,\r
+      angle: angle,\r
+      largeArcFlag: largeArcFlag,\r
+      sweepFlag: sweepFlag,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_ARC_ABS*/ 10,\r
+      pathSegTypeAsLetter : "A"\r
+    };\r
   },\r
   /*SVGPathSegArcRel*/    createSVGPathSegArcRel: function(/*float*/ x, /*float*/ y, /*float*/ r1, /*float*/ r2, /*float*/ angle, /*boolean*/ largeArcFlag, /*boolean*/ sweepFlag ) {\r
-    var s = base("$SVGPathSegCurvetoCubicAbs").$SVGPathSegArcRel.up();\r
-    s.x = x;\r
-    s.y = y;\r
-    s.r1 = r1;\r
-    s.r2 = r2;\r
-    s.angle = angle;\r
-    s.largeArcFlag = largeArcFlag;\r
-    s.sweepFlag = sweepFlag;\r
-    return s;\r
+    return {\r
+      x: x,\r
+      y: y,\r
+      r1: r1,\r
+      r2: r2,\r
+      angle: angle,\r
+      largeArcFlag: largeArcFlag,\r
+      sweepFlag: sweepFlag,\r
+      pathSegType : /*SVGPathSeg.PATHSEG_ARC_REL*/ 11,\r
+      pathSegTypeAsLetter : "a"\r
+    };\r
   },\r
   /*SVGPathSegLinetoHorizontalAbs*/    createSVGPathSegLinetoHorizontalAbs: function(/*float*/ x ) {\r
     return {\r