svnno****@sourc*****
svnno****@sourc*****
2010年 9月 26日 (日) 20:31:23 JST
Revision: 2021
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2021
Author: dhrname
Date: 2010-09-26 20:31:23 +0900 (Sun, 26 Sep 2010)
Log Message:
-----------
NAIBU._setPaintの高速化をはかった
Modified Paths:
--------------
branches/06x/061/org/w3c/dom/css.js
branches/06x/061/org/w3c/dom/svg.js
Modified: branches/06x/061/org/w3c/dom/css.js
===================================================================
--- branches/06x/061/org/w3c/dom/css.js 2010-09-26 10:55:46 UTC (rev 2020)
+++ branches/06x/061/org/w3c/dom/css.js 2010-09-26 11:31:23 UTC (rev 2021)
@@ -527,20 +527,21 @@
fill : "black",
stroke : "none",
cursor : "auto",
+ visibility : "visible",
+ display : "inline-block",
opacity : "1",
fillOpacity : "1",
strokeWidth : "1",
- fillRule : "nonzero",
strokeDasharray : "none",
strokeDashoffset : "0",
strokeLinecap : "butt",
strokeLinejoin : "miter",
strokeMiterlimit : "4",
strokeOpacity : "1",
- visibility : "visible",
writingMode : "lr-tb",
fontFamily : "serif",
fontSize : "12",
+ color : "black",
fontSizeAdjust : "none",
fontStretch : "normal",
fontStyle : "normal",
@@ -556,10 +557,7 @@
// raises(dom::DOMException) on setting
//簡略プロパティに関しては、初期値を再考せよ
clip : "auto",
- color : "black",
- cursor : "auto",
direction : "ltr",
- display : "inline",
letterSpacing : "normal",
lineHeight : "normal",
overflow : "visible",
@@ -611,8 +609,10 @@
glyphOrientationHorizontal : "0deg",
glyphOrientationVertical : "auto",
kerning : "auto",
- textAnchor : "start"
+ textAnchor : "start",
+ fillRule : "nonzero"
};
+CSS2Properties.visibility._n = 1; //初期値の設定(_setPaintで使う)
function CSSStyleSheet() {
/*CSSRule*/ this.ownerRule = null;
Modified: branches/06x/061/org/w3c/dom/svg.js
===================================================================
--- branches/06x/061/org/w3c/dom/svg.js 2010-09-26 10:55:46 UTC (rev 2020)
+++ branches/06x/061/org/w3c/dom/svg.js 2010-09-26 11:31:23 UTC (rev 2021)
@@ -2156,10 +2156,16 @@
el.style.cursor = cursor;
}
var vis = style.getPropertyValue("visibility");
- el.style.visibility = vis;
+ if (!!!vis._n) { //初期値でないならば
+ el.style.visibility = vis;
+ }
var disp = style.getPropertyValue("display");
- el.style.display = disp;
- tod = el = fill = stroke = style = cursor = tar = matrix = null;
+ if (disp === "none") {
+ el.style.display = "none";
+ } else if (disp !== "inline-block") {
+ el.style.display = "inline-block";
+ }
+ tod = el = fill = stroke = style = cursor = tar = matrix = vis = disp = null;
};
function SVGPathElement() {