svnno****@sourc*****
svnno****@sourc*****
2011年 2月 12日 (土) 23:26:14 JST
ForkRevision: 2384
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2384
Author: dhrname
Date: 2011-02-12 23:26:14 +0900 (Sat, 12 Feb 2011)
Log Message:
-----------
0.70統合
Modified Paths:
--------------
branches/07x/org/w3c/dom/events.js
branches/07x/org/w3c/dom/svg.js
Property Changed:
----------------
branches/07x/org/
branches/07x/org/w3c/
branches/07x/org/w3c/core.js
branches/07x/org/w3c/dom/css.js
branches/07x/org/w3c/dom/events.js
branches/07x/org/w3c/dom/svg.js
Property changes on: branches/07x/org
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/06x/061/org:1864-2067
/branches/06x/062/org:2071-2106
/branches/06x/063/org:2110-2146
/branches/06x/064/org:2149-2177
/branches/06x/065/org:2179-2209
/branches/06x/066/org:2211-2236
/branches/06x/067/org:2257-2282
/branches/06x/068/org:2284-2314
/branches/06x/069/org:2317-2352
/branches/06x/org:1861-2353
+ /branches/06x/061/org:1864-2067
/branches/06x/062/org:2071-2106
/branches/06x/063/org:2110-2146
/branches/06x/064/org:2149-2177
/branches/06x/065/org:2179-2209
/branches/06x/066/org:2211-2236
/branches/06x/067/org:2257-2282
/branches/06x/068/org:2284-2314
/branches/06x/069/org:2317-2352
/branches/06x/org:1861-2353
/branches/07x/070/org:2363-2383
Property changes on: branches/07x/org/w3c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/06x/061/org/w3c:1864-2067
/branches/06x/062/org/w3c:2071-2106
/branches/06x/063/org/w3c:2110-2146
/branches/06x/064/org/w3c:2149-2177
/branches/06x/065/org/w3c:2179-2209
/branches/06x/066/org/w3c:2211-2236
/branches/06x/067/org/w3c:2257-2282
/branches/06x/068/org/w3c:2284-2314
/branches/06x/069/org/w3c:2317-2352
/branches/06x/org/w3c:1861-2353
/branches/ufltima:1621-1788
+ /branches/06x/061/org/w3c:1864-2067
/branches/06x/062/org/w3c:2071-2106
/branches/06x/063/org/w3c:2110-2146
/branches/06x/064/org/w3c:2149-2177
/branches/06x/065/org/w3c:2179-2209
/branches/06x/066/org/w3c:2211-2236
/branches/06x/067/org/w3c:2257-2282
/branches/06x/068/org/w3c:2284-2314
/branches/06x/069/org/w3c:2317-2352
/branches/06x/org/w3c:1861-2353
/branches/07x/070/org/w3c:2363-2383
/branches/ufltima:1621-1788
Property changes on: branches/07x/org/w3c/core.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/06x/061/org/w3c/core.js:1864-2067
/branches/06x/062/org/w3c/core.js:2071-2106
/branches/06x/063/org/w3c/core.js:2110-2146
/branches/06x/064/org/w3c/core.js:2149-2177
/branches/06x/065/org/w3c/core.js:2179-2209
/branches/06x/066/org/w3c/core.js:2211-2244
/branches/06x/067/org/w3c/core.js:2257-2282
/branches/06x/068/org/w3c/core.js:2284-2314
/branches/06x/069/org/w3c/core.js:2317-2352
/branches/06x/org/w3c/core.js:1861-2353
/branches/ufltima/core.js:1621-1854
+ /branches/06x/061/org/w3c/core.js:1864-2067
/branches/06x/062/org/w3c/core.js:2071-2106
/branches/06x/063/org/w3c/core.js:2110-2146
/branches/06x/064/org/w3c/core.js:2149-2177
/branches/06x/065/org/w3c/core.js:2179-2209
/branches/06x/066/org/w3c/core.js:2211-2244
/branches/06x/067/org/w3c/core.js:2257-2282
/branches/06x/068/org/w3c/core.js:2284-2314
/branches/06x/069/org/w3c/core.js:2317-2352
/branches/06x/org/w3c/core.js:1861-2353
/branches/07x/070/org/w3c/core.js:2363-2383
/branches/ufltima/core.js:1621-1854
Property changes on: branches/07x/org/w3c/dom/css.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/06x/061/org/w3c/dom/css.js:1864-2067
/branches/06x/062/org/w3c/dom/css.js:2071-2106
/branches/06x/063/org/w3c/dom/css.js:2110-2146
/branches/06x/064/org/w3c/dom/css.js:2149-2177
/branches/06x/065/org/w3c/dom/css.js:2179-2209
/branches/06x/066/org/w3c/dom/css.js:2211-2236
/branches/06x/067/org/w3c/dom/css.js:2257-2282
/branches/06x/068/org/w3c/dom/css.js:2284-2314
/branches/06x/069/org/w3c/dom/css.js:2317-2352
/branches/06x/org/w3c/dom/css.js:1861-2353
/branches/ufltima/dom/css.js:1621-1855
+ /branches/06x/061/org/w3c/dom/css.js:1864-2067
/branches/06x/062/org/w3c/dom/css.js:2071-2106
/branches/06x/063/org/w3c/dom/css.js:2110-2146
/branches/06x/064/org/w3c/dom/css.js:2149-2177
/branches/06x/065/org/w3c/dom/css.js:2179-2209
/branches/06x/066/org/w3c/dom/css.js:2211-2236
/branches/06x/067/org/w3c/dom/css.js:2257-2282
/branches/06x/068/org/w3c/dom/css.js:2284-2314
/branches/06x/069/org/w3c/dom/css.js:2317-2352
/branches/06x/org/w3c/dom/css.js:1861-2353
/branches/07x/070/org/w3c/dom/css.js:2363-2383
/branches/ufltima/dom/css.js:1621-1855
Modified: branches/07x/org/w3c/dom/events.js
===================================================================
--- branches/07x/org/w3c/dom/events.js 2011-02-12 14:23:59 UTC (rev 2383)
+++ branches/07x/org/w3c/dom/events.js 2011-02-12 14:26:14 UTC (rev 2384)
@@ -141,6 +141,9 @@
throw new EventException(EventException.UNSPECIFIED_EVENT_TYPE_ERR);
}
if (!this.ownerDocument._isLoaded) {
+ /*以下では、画像の処理に時間がかかりそうな場合、処理落ちとして、遅延処理
+ *を行い、バッファリングにイベント送付処理をためていく作業となる
+ */
if (evt.type === "SVGLoad") {
this.ownerDocument._isLoaded = 1;
}
@@ -190,7 +193,7 @@
evt.eventPhase = type;
var tce = td._capter; //tceは登録しておいたリスナーのリスト
for (var j=0,tcli=tce.length;j<tcli;++j){
- if (tce[j]) {
+ if (tce[j] && (evt.type === tce[j]._type)) {
tce[j].handleEvent(evt);
}
}
@@ -239,7 +242,6 @@
*イベントの雛形となる。プロパティもすべて含めて、必須
*/
function Event() {
- /*DOMTimeStamp*/ this.timeStamp = +(new Date());
return this;
};
// PhaseType
@@ -247,6 +249,7 @@
/*unsigned short*/ Event.AT_TARGET = 2;
/*unsigned short*/ Event.BUBBLING_PHASE = 3;
Event.prototype = {
+ /*DOMTimeStamp*/ timeStamp : 0,
/*DOMString*/ type : null,
/*EventTarget*/ target : null,
/*EventTarget*/ currentTarget : null,
@@ -273,6 +276,10 @@
function DocumentEvent() {
return this;
}*/
+/*_date_プロパティは、createEventメソッドで使われるために、
+ *あらかじめ、Dateオブジェクトを作成しておいて、それを入れるプロパティ
+ */
+Document.prototype._date_ = new Date();
/*Event*/ Document.prototype.createEvent = function( /*string*/ eventType) {
var evt;
if (eventType === "MutationEvents") {
@@ -289,6 +296,7 @@
evt = new Event();
}
evt.type = eventType;
+ evt.timeStamp = this._date_.getTime();
return evt;
};
@@ -467,7 +475,6 @@
}
var descend = n.getElementsByTagNameNS("*", "*"); //全子孫要素を取得
if (descend) {
- evt.initMutationEvent("DOMNodeInsertedIntoDocument", false, false, null, null, null, null, null);
for (var i=0,dli=descend.length;i<dli;++i) {
var di = descend[i];
di.dispatchEvent(evt);
Property changes on: branches/07x/org/w3c/dom/events.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/06x/061/org/w3c/dom/events.js:1864-2067
/branches/06x/062/org/w3c/dom/events.js:2071-2106
/branches/06x/063/org/w3c/dom/events.js:2110-2146
/branches/06x/064/org/w3c/dom/events.js:2149-2177
/branches/06x/065/org/w3c/dom/events.js:2179-2209
/branches/06x/066/org/w3c/dom/events.js:2211-2244
/branches/06x/067/org/w3c/dom/events.js:2257-2282
/branches/06x/068/org/w3c/dom/events.js:2284-2314
/branches/06x/069/org/w3c/dom/events.js:2317-2352
/branches/06x/org/w3c/dom/events.js:1861-2353
/branches/ufltima/dom/events.js:1621-1856
+ /branches/06x/061/org/w3c/dom/events.js:1864-2067
/branches/06x/062/org/w3c/dom/events.js:2071-2106
/branches/06x/063/org/w3c/dom/events.js:2110-2146
/branches/06x/064/org/w3c/dom/events.js:2149-2177
/branches/06x/065/org/w3c/dom/events.js:2179-2209
/branches/06x/066/org/w3c/dom/events.js:2211-2244
/branches/06x/067/org/w3c/dom/events.js:2257-2282
/branches/06x/068/org/w3c/dom/events.js:2284-2314
/branches/06x/069/org/w3c/dom/events.js:2317-2352
/branches/06x/org/w3c/dom/events.js:1861-2353
/branches/07x/070/org/w3c/dom/events.js:2363-2383
/branches/ufltima/dom/events.js:1621-1856
Modified: branches/07x/org/w3c/dom/svg.js
===================================================================
--- branches/07x/org/w3c/dom/svg.js 2011-02-12 14:23:59 UTC (rev 2383)
+++ branches/07x/org/w3c/dom/svg.js 2011-02-12 14:26:14 UTC (rev 2384)
@@ -385,11 +385,11 @@
};
function SVGStringList() {
- /*readonly unsigned long*/ this.numberOfItems = 0;
this._list = []; //リストの本体
return this;
};
SVGStringList.prototype = {
+ /*readonly unsigned long*/ numberOfItems : 0,
/*void*/ clear : function(){
this._list = [];
this.numberOfItems = 0;
@@ -463,7 +463,6 @@
};
function SVGNumberList() {
- /*readonly unsigned long*/ this.numberOfItems = 0;
this._list = []; //リストの本体
return this;
};
@@ -558,7 +557,6 @@
return this;
};
function SVGLengthList() {
- /*readonly unsigned long*/ this.numberOfItems = 0;
this._list = []; //リストの本体
return this;
};
@@ -1696,6 +1694,7 @@
} else {
/*全要素の読み込みが終了した場合*/
if (s.implementation._buffer_) {
+ screen.updateInterval = 0;
/*以下はバッファリングにためておいた要素とイベントを、後から実行する*/
NAIBU._buff = setInterval(function(){
if (DOMImplementation._buffer_.length === 0) {
@@ -1708,13 +1707,16 @@
if (!DOMImplementation._buffer_[1]) {
clearInterval(NAIBU._buff);
DOMImplementation._buffer_ = null;
+ NAIBU.Time.start();
return;
}
}
}, 1);
+ s = null;
+ } else {
+ s = null;
+ NAIBU.Time.start();
}
- s = null;
- NAIBU.Time.start();
delete NAIBU.doc;
}
}
@@ -1761,7 +1763,6 @@
};
function SVGPointList() {
- /*readonly unsigned long*/ this.numberOfItems = 0;
this._list = [];
return this;
};
@@ -1902,9 +1903,7 @@
};
function SVGTransform() {
- /*readonly unsigned short*/ this.type = SVGTransform.SVG_TRANSFORM_UNKNOWN;
/*readonly SVGMatrix*/ this.matrix = new SVGMatrix();
- /*readonly float*/ this.angle = 0;
return this;
};
// Transform Types
@@ -1916,39 +1915,42 @@
/*unsigned short*/ SVGTransform.SVG_TRANSFORM_SKEWX = 5;
/*unsigned short*/ SVGTransform.SVG_TRANSFORM_SKEWY = 6;
SVGTransform.prototype = {
+ /*ダミーの単位行列。各メソッドで使う*/
+ _matrix : (new SVGMatrix()),
+ /*readonly unsigned short*/ type : SVGTransform.SVG_TRANSFORM_UNKNOWN,
+ /*readonly float*/ angle : 0,
/*void*/ setMatrix : function(/*SVGMatrix*/ matrix ) {
this.type = SVGTransform.SVG_TRANSFORM_MATRIX;
- this.matrix = this.matrix.multiply(matrix);
+ this.matrix = this._matrix.multiply(matrix);
},
/*void*/ setTranslate : function(/*float*/ tx, /*float*/ ty ) {
this.type = SVGTransform.SVG_TRANSFORM_TRANSLATE;
- this.matrix = this.matrix.translate(tx, ty);
+ this.matrix = this._matrix.translate(tx, ty);
},
/*void*/ setScale : function(/*float*/ sx, /*float*/ sy ) {
this.type = SVGTransform.SVG_TRANSFORM_SCALE;
- this.matrix = this.matrix.scaleNonUniform(sx, sy);
+ this.matrix = this._matrix.scaleNonUniform(sx, sy);
},
/*void*/ setRotate : function(/*float*/ angle, /*float*/ cx, /*float*/ cy ) {
this.angle = angle;
this.type = SVGTransform.SVG_TRANSFORM_ROTATE;
- this.matrix = this.matrix.rotate(angle);
+ this.matrix = this._matrix.rotate(angle);
this.matrix.e = (1-this.matrix.a)*cx - this.matrix.c*cy;
this.matrix.f = -this.matrix.b*cx + (1-this.matrix.d)*cy;
},
/*void*/ setSkewX : function(/*float*/ angle ) {
this.angle = angle;
this.type = SVGTransform.SVG_TRANSFORM_SKEWX;
- this.matrix = this.matrix.skewX(angle);
+ this.matrix = this._matrix.skewX(angle);
},
/*void*/ setSkewY : function(/*float*/ angle ) {
this.angle = angle;
this.type = SVGTransform.SVG_TRANSFORM_SKEWY;
- this.matrix = this.matrix.skewY(angle);
+ this.matrix = this._matrix.skewY(angle);
}
};
function SVGTransformList() {
- /*readonly unsigned long*/ this.numberOfItems = 0;
this._list = [];
return this;
};
@@ -1964,10 +1966,11 @@
if(this.numberOfItems === 0) {
return null;
} else {
- var s = this.getItem(0);
+ var s = this.getItem(0), m = s.matrix;
for (var i=1,nli=this.numberOfItems;i<nli;++i) {
- s.setMatrix(this.getItem(i).matrix)
+ m = m.multiply(this.getItem(i).matrix);
}
+ s.setMatrix(m);
this.initialize(s);
return s;
}
@@ -2206,7 +2209,6 @@
return this;
};
function SVGPathSegList() {
- /*readonly unsigned long*/ this.numberOfItems = 0;
this._list = []; //リストの本体
return this;
};
@@ -2371,7 +2373,7 @@
*
*SVG1.1 「8.3.9 The grammar for path data」の項目にある最後の文章を参照
*/
- var tnl = tar.normalizedPathSegList, tlist = tar.pathSegList, D = [], _parseFloat = parseFloat;
+ var tnl = tar.normalizedPathSegList, tlist = tar.pathSegList, D = [];
if (tnl.numberOfItems > 0) {
tnl.clear();
tlist.clear();
@@ -2391,7 +2393,7 @@
for (var i=0, dli=dd.length;i<dli;++i) {
D[i] = dd[i].match(sgs);
for (var j=1, dili=D[i].length;j<dili;++j) {
- D[i][j] = _parseFloat(D[i][j]); //_parseFloatは高速化のためのAlias
+ D[i][j] = (D[i][j]) | 0;
}
}
sgs = dd = null;
@@ -2461,14 +2463,14 @@
/*以下の処理は、pathSegListからnormalizedPathSegListへの
*変換をする処理。相対座標を絶対座標に変換して、M、L、Cコマンドに正規化していく
*/
- var cx = 0, cy = 0; //現在セグメントの終了点の絶対座標を示す （相対座標を絶対座標に変換するときに使用）
- var xn = 0, yn = 0; //T,tコマンドで仮想的な座標を算出するのに用いる。第一コントロール点
+ var cx = 0, cy = 0; //現在セグメントの終了点の絶対座標を示す （相対座標を絶対座標に変換するときに使用）
+ var xn = 0, yn = 0; //T,tコマンドで仮想的な座標を算出するのに用いる。第一コントロール点
var startx = 0, starty = 0; //M,mコマンドにおける始点座標（Z,zコマンドで用いる）
for (var j=0, tli=tlist.numberOfItems;j<tli;++j) {
var ti = tlist.getItem(j), ts = ti.pathSegType, dii = ti.pathSegTypeAsLetter;
if (ts === SVGPathSeg.PATHSEG_UNKNOWN) {
} else {
- var rx = cx, ry = cy; //rx, ryは前のセグメントの終了点
+ var rx = cx, ry = cy; //rx, ryは前のセグメントの終了点
if (ts % 2 === 1) { //相対座標ならば
cx += ti.x;
cy += ti.y;
@@ -2526,7 +2528,7 @@
tnl.appendItem(tar.createSVGPathSegCurvetoCubicAbs(cx, cy, (rx + 2*x1) / 3, (ry + 2*y1) / 3, (2*x1 + cx) / 3, (2*y1 + cy) / 3));
x1 = y1 = null;
} else if (dii === "A" || dii === "a") {
- (function(ti, cx, cy, rx, ry, tar, tnl) { //変数を隠蔽するためのfunction
+ (function(ti, cx, cy, rx, ry, tar, tnl) { //変数を隠蔽するためのfunction
/*以下は、Arctoを複数のCuvetoに変換する処理
*SVG 1.1 「F.6 Elliptical arc implementation notes」の章を参照
*http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
@@ -3279,33 +3281,26 @@
tnext = tpar = null;
tar.addEventListener("DOMNodeInsertedIntoDocument", function(evt) {
var tar = evt.target;
- var list = ["m", tar.x1.baseVal.value, tar.y1.baseVal.value, "l", tar.x2.baseVal.value, tar.y2.baseVal.value];
//以下は、配列listそのものをCTMで座標変換していく処理
- var par = tar.ownerDocument.documentElement, ctm = tar.getScreenCTM();
- for (var i=0, lili=list.length;i<lili;) {
- if (isNaN(list[i])) { //コマンド文字は読み飛ばす
- ++i;
- continue;
- }
- var p = par.createSVGPoint();
- p.x = list[i];
- p.y = list[i+1];
- var pmt = p.matrixTransform(ctm);
- list[i] = pmt.x;
- ++i;
- list[i] = pmt.y;
- ++i;
- p = pmt = null;
- }
- var dat = list.join(" ");
+ var vi = tar.ownerDocument.documentElement, ctm = tar.getScreenCTM();
+ var dat = "m ";
+ var p = vi.createSVGPoint();
+ p.x = tar.x1.baseVal.value;
+ p.y = tar.y1.baseVal.value;
+ var pmt = p.matrixTransform(ctm);
+ dat += pmt.x+ " " +pmt.y+ " l ";
+ p.x = tar.x2.baseVal.value;
+ p.y = tar.y2.baseVal.value;
+ pmt = p.matrixTransform(ctm);
+ dat += pmt.x+ " " +pmt.y;
+ p = pmt = null;
//VMLに結び付けていく
- var ele = tar._tar, vi = tar.ownerDocument.documentElement;
- var w = vi.width.baseVal.value, h = vi.height.baseVal.value;
+ var ele = tar._tar, w = vi.width.baseVal.value, h = vi.height.baseVal.value;
ele.path = dat;
ele.coordsize = w + " " + h;
NAIBU._setPaint(tar, ctm);
delete tar._cacheMatrix, tar._currentStyle;
- evt = ele = tar = dat = list = ctm = w = h = null;
+ evt = ele = tar = dat = list = ctm = vi = w = h = null;
}, false);
evt = tar = null;
}, false);
@@ -3900,7 +3895,7 @@
} else if ((ti.localName === "a") && (ti.namespaceURI === "http://www.w3.org/2000/svg") && ti.firstChild) {
ttp = ti._tar;
ti = ti.firstChild;
- --i;
+ i-=2;
}
}
}
Property changes on: branches/07x/org/w3c/dom/svg.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/06x/061/org/w3c/dom/svg.js:1864-2067
/branches/06x/062/org/w3c/dom/svg.js:2071-2106
/branches/06x/063/org/w3c/dom/svg.js:2110-2146
/branches/06x/064/org/w3c/dom/svg.js:2149-2177
/branches/06x/065/org/w3c/dom/svg.js:2179-2209
/branches/06x/066/org/w3c/dom/svg.js:2211-2239
/branches/06x/067/org/w3c/dom/svg.js:2257-2282
/branches/06x/068/org/w3c/dom/svg.js:2284-2314
/branches/06x/069/org/w3c/dom/svg.js:2317-2352
/branches/06x/org/w3c/dom/svg.js:1861-2353
/branches/ufltima/dom/svg.js:1621-1856
+ /branches/06x/061/org/w3c/dom/svg.js:1864-2067
/branches/06x/062/org/w3c/dom/svg.js:2071-2106
/branches/06x/063/org/w3c/dom/svg.js:2110-2146
/branches/06x/064/org/w3c/dom/svg.js:2149-2177
/branches/06x/065/org/w3c/dom/svg.js:2179-2209
/branches/06x/066/org/w3c/dom/svg.js:2211-2239
/branches/06x/067/org/w3c/dom/svg.js:2257-2282
/branches/06x/068/org/w3c/dom/svg.js:2284-2314
/branches/06x/069/org/w3c/dom/svg.js:2317-2352
/branches/06x/org/w3c/dom/svg.js:1861-2353
/branches/07x/070/org/w3c/dom/svg.js:2363-2383
/branches/ufltima/dom/svg.js:1621-1856