From: dhrname <dhrname@users.sourceforge.jp>
Date: Sat, 12 Jan 2013 11:42:36 +0000 (+0900)
Subject: _caメソッドのテキスト処理を改善して高速化
X-Git-Tag: v16beta~376
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d4bca43440780e57b32544e6060d4c1498110653;p=sie%2Fsie.git

_caメソッドのテキスト処理を改善して高速化
---

diff --git a/org/w3c/dom/svg.js b/org/w3c/dom/svg.js
index 185f496..3c3e7f4 100644
--- a/org/w3c/dom/svg.js
+++ b/org/w3c/dom/svg.js
@@ -1753,7 +1753,7 @@ function _ca_() {
         s = DOMImplementation.createDocument("http://www.w3.org/2000/svg", "svg"),
         tar = s.documentElement,
         tview = tar.viewport,
-        objw, objh, fi, n, attr, att, w, h,
+        objw, objh, fi, attr, w, h,
         sdt = tar._tar,
         sp = _doc.createElement("div"),
         dcp = _doc.createElement("v:group"),
@@ -1803,8 +1803,7 @@ function _ca_() {
       ndoc.loadXML(tmp);
       tmp = enti = map = void 0;
     }
-    tview.top = 0;
-    tview.left = 0;
+    tview.top = tview.left = 0;
     tview.width = objei.clientWidth;
     tview.height = objei.clientHeight;
     if (tview.height < 24) { //IEの標準モードではclientHeightプロパティの値が小さくなることがある
@@ -1815,18 +1814,13 @@ function _ca_() {
     }
     objw = objei.getAttribute("width");
     objh = objei.getAttribute("height");
-    if (objw) {
-      tar.setAttributeNS(null, "width", objw);
-    }
-    if (objh) {
-      tar.setAttributeNS(null, "height", objh);
-    }
+    objw && tar.setAttributeNS(null, "width", objw);
+    objh && tar.setAttributeNS(null, "height", objh);
     fi = ndoc.documentElement.firstChild;
     attr = ndoc.documentElement.attributes;
     /*ルート要素のNamedNodeMapを検索する*/
     for (var i=0,atli=attr.length;i<atli;++i) {
-      att = s.importNode(attr[i], false);
-      tar.setAttributeNodeNS(att);
+      tar.setAttributeNodeNS(s.importNode(attr[i], false));
     }
     str = attr = void 0;
     dcp.style.width = tview.width+ "px";
@@ -1840,8 +1834,7 @@ function _ca_() {
     }
     dcp.appendChild(sdt);
     while (fi) { //子ノードを検索して、子供がいれば、importNodeメソッドを再帰的に実行する
-      n = s.importNode(fi, true);
-      tar.appendChild(n);
+      tar.appendChild(s.importNode(fi, true));
       fi = fi.nextSibling;
     }
     fi = void 0;
@@ -1860,14 +1853,14 @@ function _ca_() {
     tar.height.baseVal._emToUnit(fontSize);
     sw = tar.width.baseVal.value;
     sh = tar.height.baseVal.value;
-    backr.style.position = "absolute";
+    backrs = backr.style;
+    backrs.position = "absolute";
     w = tview.width;
     h = tview.height;
-    backr.style.width = w+ "px";
-    backr.style.height = h+ "px";
-    backr.style.zIndex = -1;
-    backr.stroked = "false";
-    backr.filled = "false";
+    backrs.width = w+ "px";
+    backrs.height = h+ "px";
+    backrs.zIndex = -1;
+    backr.stroked = backr.filled = "false";
     tar._tar.appendChild(backr);
     trstyle = tar._tar.style;
     trstyle.visibility = "visible";
@@ -1910,6 +1903,7 @@ function _ca_() {
       }
     }
     //以下、テキストの位置を修正
+    trstyle.visibility = "hidden";
     text = s.documentElement._tar.getElementsByTagName("div");
     for (var i=0, texti;text[i];++i) {
       texti = text[i];
@@ -1922,9 +1916,10 @@ function _ca_() {
     }
     //ビューポートの位置をスクロールで調整　（なお、_txプロパティはSVGSVGElementのSIEコードを参照)
     ifcw && ifcw.scroll(-s.documentElement._tx, -s.documentElement._ty);
+    trstyle.visibility = "visible";
     s._isLoaded = 1;  //_isLoadedプロパティはevents::dispatchEventメソッドで使う
     s.defaultView._cache = s.defaultView._cache_ele = null;
-    oba = _doc = evt = ndoc = objei = tar = tview = objw = objh = n = att = sdt = sp = dcp = backr = sw = sh = style = fontSize = void 0;
+    oba = _doc = evt = ndoc = objei = tar = tview = objw = objh = sdt = sp = dcp = backr = sw = sh = style = fontSize = void 0;
     trstyle = backrs = text = texti = i = bfl = bft = bl = bt = text = _parseFloat = w = h = viewWidth = viewHeight = backdown = backright = void 0;
     /*IEのメモリリーク対策として、空関数を入力*/
     this.xmlhttp.onreadystatechange = NAIBU.emptyFunction;