svnno****@sourc*****
svnno****@sourc*****
2010年 2月 8日 (月) 21:53:56 JST
Revision: 1648
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1648
Author: dhrname
Date: 2010-02-08 21:53:56 +0900 (Mon, 08 Feb 2010)
Log Message:
-----------
1, 文法の修正
2, SVGCSSRuleオブジェクトの追加
Modified Paths:
--------------
branches/ufltima/dom/svg.js
Modified: branches/ufltima/dom/svg.js
===================================================================
--- branches/ufltima/dom/svg.js 2010-02-08 11:30:46 UTC (rev 1647)
+++ branches/ufltima/dom/svg.js 2010-02-08 12:53:56 UTC (rev 1648)
@@ -530,9 +530,9 @@
SVGUnitTypes = {
// Unit Types
- /*unsigned short*/ SVG_UNIT_TYPE_UNKNOWN : 0;
- /*unsigned short*/ SVG_UNIT_TYPE_USERSPACEONUSE : 1;
- /*unsigned short*/ SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : 2;
+ /*unsigned short*/ SVG_UNIT_TYPE_UNKNOWN : 0,
+ /*unsigned short*/ SVG_UNIT_TYPE_USERSPACEONUSE : 1,
+ /*unsigned short*/ SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : 2
};
/*SVGURIReferenceオブジェクトはURI参照を用いる要素に適用される
@@ -543,6 +543,14 @@
/*readonly SVGAnimatedString*/ this.href = new SVGAnimatedString();
return this;
};
+function SVGCSSRule() {
+ CSSRule.apply(this, arguments);
+ // Additional CSS RuleType to support ICC color specifications
+ /*const unsigned short*/ this.COLOR_PROFILE_RULE = 7;
+ return this;
+};
+SVGCSSRule.constructor = CSSRule;
+SVGCSSRule.prototype = new CSSRule(); //ノードのプロトタイプチェーンを作って、継承
/*SVGDocument
*SVGの文書オブジェクト
@@ -639,7 +647,7 @@
var s = this.createSVGTransformFromMatrix(this.createSVGMatrix());
return s;
};
-/*SVGTransform*/ SVGSVGElement.prototype.createSVGTransformFromMatrix = function(/*SVGMatrix*/ matrix )){
+/*SVGTransform*/ SVGSVGElement.prototype.createSVGTransformFromMatrix = function(/*SVGMatrix*/ matrix ){
var s = new SVGTransform();
s.setMatrix(matrix);
return s;
@@ -750,7 +758,7 @@
/*readonly unsigned long*/ this.length = 0;
return this;
};
-/*SVGElementInstance*/ SVGElementInstanceList.prototype.item (/*unsigned long*/ index ) {
+/*SVGElementInstance*/ SVGElementInstanceList.prototype.item = function(/*unsigned long*/ index ) {
return (this[index]);
}
function SVGImageElement() {
@@ -909,7 +917,7 @@
var s = this.multiply(m);
m = null;
return s;
- }
+ },
/*SVGMatrix*/ rotate : function(/*float*/ angle ) {
var m = new SVGMatrix(), rad = angle / 180 * Math.PI; //ラジアン変換
m.a = Math.cos(rad);
@@ -979,29 +987,29 @@
/*unsigned short*/ SVGTransform.SVG_TRANSFORM_SKEWX = 5;
/*unsigned short*/ SVGTransform.SVG_TRANSFORM_SKEWY = 6;
SVGTransform.prototype = {
- /*void*/ setMatrix (/*SVGMatrix*/ matrix ) {
+ /*void*/ setMatrix : function(/*SVGMatrix*/ matrix ) {
this.type = SVGTransform.SVG_TRANSFORM_MATRIX;
this.matrix.multiply(matrix);
},
- /*void*/ setTranslate (/*float*/ tx, /*float*/ ty ) {
+ /*void*/ setTranslate : function(/*float*/ tx, /*float*/ ty ) {
this.type = SVGTransform.SVG_TRANSFORM_TRANSLATE;
this.matrix.translate(tx, ty);
},
- /*void*/ setScale (/*float*/ sx, /*float*/ sy ) {
+ /*void*/ setScale : function(/*float*/ sx, /*float*/ sy ) {
this.type = SVGTransform.SVG_TRANSFORM_SCALE;
this.matrix.scaleNonUniform(sx, sy);
},
- /*void*/ setRotate (/*float*/ angle, /*float*/ cx, /*float*/ cy ) {
+ /*void*/ setRotate : function(/*float*/ angle, /*float*/ cx, /*float*/ cy ) {
this.angle = angle;
this.type = SVGTransform.SVG_TRANSFORM_ROTATE;
this.matrix.translate(cx, cy).rotate(angle).translate(-cx, -cy);
},
- /*void*/ setSkewX (/*float*/ angle ) {
+ /*void*/ setSkewX : function(/*float*/ angle ) {
this.angle = angle;
this.type = SVGTransform.SVG_TRANSFORM_SKEWX;
this.matrix.skewX(angle);
},
- /*void*/ setSkewY (/*float*/ angle ) {
+ /*void*/ setSkewY : function(/*float*/ angle ) {
this.angle = angle;
this.type = SVGTransform.SVG_TRANSFORM_SKEWY;
this.matrix.skewY(angle);
@@ -1257,9 +1265,6 @@
SVGPathSegList.prototype[prop] = SVGStringList.prototype[prop];
}
- return this;
-};
-
function SVGPathElement() {
SVGElement.apply(this, arguments);
this.tar = document.createElement("v:shape");
@@ -1354,7 +1359,7 @@
s.sweepFlag = sweepFlag;
return s;
};
- /*SVGPathSegArcRel*/ SVGPathElement.prototype.createSVGPathSegArcRel = function(/*float*/ x, /*float*/ y, /*float*/ r1, /*float*/ r2, /*float*/ angle, in boolean largeArcFlag, in boolean sweepFlag ) {
+ /*SVGPathSegArcRel*/ SVGPathElement.prototype.createSVGPathSegArcRel = function(/*float*/ x, /*float*/ y, /*float*/ r1, /*float*/ r2, /*float*/ angle, /*boolean*/ largeArcFlag, /*boolean*/ sweepFlag ) {
var s = new SVGPathSegArcRel();
s.x = x;
s.y = y;
@@ -1658,7 +1663,7 @@
/*readonly SVGAnimatedEnumeration*/ this.markerUnits = new SVGAnimatedEnumeration();
/*readonly SVGAnimatedLength*/ this.markerWidth = new SVGAnimatedLength(0);
/*readonly SVGAnimatedLength*/ this.markerHeight = new SVGAnimatedLength(0);
- /*readonly SVGAnimatedEnumeration*/ this.orientType = new SVGAnimatedEnumeration);
+ /*readonly SVGAnimatedEnumeration*/ this.orientType = new SVGAnimatedEnumeration();
/*readonly SVGAnimatedAngle*/ this.orientAngle = new SVGAnimatedAngle();
//SVGFitToViewBoxのインターフェースを用いる
/*readonly SVGAnimatedRect*/ this.viewBox = new SVGAnimatedRect();
@@ -1909,7 +1914,7 @@
/*readonly float*/ this.previousScale = 1;
/*readonly SVGPoint*/ this.previousTranslate = new SVGPoint();
/*readonly float*/ this.newScale = 1;
- /*readonly SVGPoint*/ this.newTranslate; = new SVGPoint();
+ /*readonly SVGPoint*/ this.newTranslate = new SVGPoint();
return this;
};
SVGZoomEvent.constructor = UIEvent;
@@ -2085,5 +2090,4 @@
SVGForeignObjectElement.constructor = SVGElement;
SVGForeignObjectElement.prototype = new SVGElement();
-#endif // _SVG_IDL_
-}
\ No newline at end of file
+//#endif _SVG_IDL_
\ No newline at end of file