Fork

[Sie-announce] SIEコード [2643] 1, チケット #25063「currentColorを使用したときに不具合」を修正

svnno****@sourc***** svnno****@sourc*****
2011年 5月 4日 (水) 20:30:03 JST

• 前の記事 [Sie-announce] SIEコード [2642] stop-colorに対して、currentColorの値をサポートした
• 次の記事 [Sie-announce] SIEコード [2644]
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 2643
          http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2643
Author:   dhrname
Date:     2011-05-04 20:30:02 +0900 (Wed, 04 May 2011)

Log Message:
-----------
1, チケット #25063「currentColorを使用したときに不具合」を修正
2, stop-colorでcurrentColorを対応

Ticket Links:
:-----------
    http://sourceforge.jp/projects/sie/tracker/detail/25063

Modified Paths:
--------------
    branches/07x/org/w3c/dom/css.js
    branches/07x/org/w3c/dom/svg.js

Property Changed:
----------------
    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/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/07x/070/org/w3c:2363-2383
/branches/07x/071/org/w3c:2385-2433
/branches/07x/072/org/w3c:2435-2474
/branches/07x/073/org/w3c:2476-2509
/branches/07x/074/org/w3c:2511-2556
/branches/07x/075/org/w3c:2558-2597
/branches/07x/076/org/w3c:2600-2631
/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/07x/071/org/w3c:2385-2433
/branches/07x/072/org/w3c:2435-2474
/branches/07x/073/org/w3c:2476-2509
/branches/07x/074/org/w3c:2511-2556
/branches/07x/075/org/w3c:2558-2597
/branches/07x/076/org/w3c:2600-2631,2642
/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/07x/070/org/w3c/core.js:2363-2383
/branches/07x/071/org/w3c/core.js:2385-2433
/branches/07x/072/org/w3c/core.js:2435-2474
/branches/07x/073/org/w3c/core.js:2476-2509
/branches/07x/074/org/w3c/core.js:2511-2556
/branches/07x/075/org/w3c/core.js:2558-2597
/branches/07x/076/org/w3c/core.js:2600-2631
/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/07x/071/org/w3c/core.js:2385-2433
/branches/07x/072/org/w3c/core.js:2435-2474
/branches/07x/073/org/w3c/core.js:2476-2509
/branches/07x/074/org/w3c/core.js:2511-2556
/branches/07x/075/org/w3c/core.js:2558-2597
/branches/07x/076/org/w3c/core.js:2600-2631,2642
/branches/ufltima/core.js:1621-1854

Modified: branches/07x/org/w3c/dom/css.js
===================================================================
--- branches/07x/org/w3c/dom/css.js	2011-05-03 14:36:01 UTC (rev 2642)
+++ branches/07x/org/w3c/dom/css.js	2011-05-04 11:30:02 UTC (rev 2643)
@@ -275,7 +275,7 @@
         ti, paintType, v1,
         uri = null,
         color = null,
-        fill, stroke;
+        fill, stroke, stop;
     if (!!this[propertyName]) {
       tg = this.getPropertyCSSValue(propertyName);
     }
@@ -303,18 +303,24 @@
           uri = RegExp.$1;
         } else if (value === "currentColor") {
           paintType = /*SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR*/ 102;
-          color = this.getPropertyValue("color");
+          color = this.getPropertyValue("color") || "rgb(0,0,0)";
         }
         ti.setPaint(paintType, uri, color, null);
         paintType = v1 = uri = color = null;
       } else if (this._isStop[propertyName]) {
         ti = new SVGColor();
-        ti.colorType = /*SVGColor.SVG_COLORTYPE_RGBCOLOR*/ 1;
+        if (value === "currentColor") {
+          ti.colorType = /*SVGColor.SVG_COLORTYPE_CURRENTCOLOR*/ 3;
+          value = this.getPropertyValue("color") || "rgb(0,0,0)";
+        } else {
+          ti.colorType = /*SVGColor.SVG_COLORTYPE_RGBCOLOR*/ 1;
+        }
         ti.setRGBColor(value);
       } else if (this._isColor[propertyName]) {
         ti = new CSSPrimitiveValue();
         fill = this.getPropertyCSSValue("fill");
         stroke = this.getPropertyCSSValue("stroke");
+        stop = this.getPropertyCSSValue("stop-color");
         if (fill) {
           if (fill.paintType === /*SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR*/ 102) {
             fill.setPaint(fill.paintType, null, value, null);
@@ -323,6 +329,10 @@
           if (stroke.paintType === /*SVGPaint.SVG_PAINTTYPE_CURRENTCOLOR*/ 102) {
             stroke.setPaint(fill.paintType, null, value, null);
           }
+        } else if (stop) {
+          if (stop.colorType === /*SVGColor.SVG_COLORTYPE_CURRENTCOLOR*/ 3) {
+            stop.setRGBColor(value);
+          }
         }
       } else {
         ti = new CSSPrimitiveValue();


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/07x/070/org/w3c/dom/css.js:2363-2383
/branches/07x/071/org/w3c/dom/css.js:2385-2433
/branches/07x/072/org/w3c/dom/css.js:2435-2474
/branches/07x/073/org/w3c/dom/css.js:2476-2509
/branches/07x/074/org/w3c/dom/css.js:2511-2556
/branches/07x/075/org/w3c/dom/css.js:2558-2597
/branches/07x/076/org/w3c/dom/css.js:2600-2631
/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/07x/071/org/w3c/dom/css.js:2385-2433
/branches/07x/072/org/w3c/dom/css.js:2435-2474
/branches/07x/073/org/w3c/dom/css.js:2476-2509
/branches/07x/074/org/w3c/dom/css.js:2511-2556
/branches/07x/075/org/w3c/dom/css.js:2558-2597
/branches/07x/076/org/w3c/dom/css.js:2600-2631,2642
/branches/ufltima/dom/css.js:1621-1855


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/07x/070/org/w3c/dom/events.js:2363-2383
/branches/07x/071/org/w3c/dom/events.js:2385-2433
/branches/07x/072/org/w3c/dom/events.js:2435-2474
/branches/07x/073/org/w3c/dom/events.js:2476-2509
/branches/07x/074/org/w3c/dom/events.js:2511-2556
/branches/07x/075/org/w3c/dom/events.js:2558-2597
/branches/07x/076/org/w3c/dom/events.js:2600-2631
/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/07x/071/org/w3c/dom/events.js:2385-2433
/branches/07x/072/org/w3c/dom/events.js:2435-2474
/branches/07x/073/org/w3c/dom/events.js:2476-2509
/branches/07x/074/org/w3c/dom/events.js:2511-2556
/branches/07x/075/org/w3c/dom/events.js:2558-2597
/branches/07x/076/org/w3c/dom/events.js:2600-2631,2642
/branches/ufltima/dom/events.js:1621-1856

Modified: branches/07x/org/w3c/dom/svg.js
===================================================================
--- branches/07x/org/w3c/dom/svg.js	2011-05-03 14:36:01 UTC (rev 2642)
+++ branches/07x/org/w3c/dom/svg.js	2011-05-04 11:30:02 UTC (rev 2643)
@@ -4356,9 +4356,13 @@
     for (var i = 0; i < length; ++i) {
       stop = stops[i];
       sstyle = stop.ownerDocument.defaultView.getComputedStyle(stop, "");
-      ci = sstyle.getPropertyValue("stop-color");
-      color[i] = SVGColor.prototype._keywords[ci] || ci;
-      colors[i] = stop.offset.baseVal + " " + ci;
+      ci = sstyle.getPropertyCSSValue("stop-color");
+      if (ci && (ci.colorType === /*SVGColor.SVG_COLORTYPE_CURRENTCOLOR*/ 3)) {
+        /*再度、設定。css.jsのsetPropertyを参照*/
+        sstyle.setProperty("color", sstyle.getPropertyValue("color"));
+      }
+      color[i] =  "rgb(" +ci.rgbColor.red.cssText+ "," +ci.rgbColor.green.cssText+ "," +ci.rgbColor.blue.cssText+ ")";
+      colors[i] = stop.offset.baseVal + " " + color[i];
       opacity[i] = (sstyle.getPropertyValue("stop-opacity") || 1) * t.getPropertyValue("fill-opacity") * t.getPropertyValue("opacity");
     }
     ele["method"] = "none";


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/07x/070/org/w3c/dom/svg.js:2363-2383
/branches/07x/071/org/w3c/dom/svg.js:2385-2433
/branches/07x/072/org/w3c/dom/svg.js:2435-2474
/branches/07x/073/org/w3c/dom/svg.js:2476-2509
/branches/07x/074/org/w3c/dom/svg.js:2511-2556
/branches/07x/075/org/w3c/dom/svg.js:2558-2597
/branches/07x/076/org/w3c/dom/svg.js:2600-2631
/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/07x/071/org/w3c/dom/svg.js:2385-2433
/branches/07x/072/org/w3c/dom/svg.js:2435-2474
/branches/07x/073/org/w3c/dom/svg.js:2476-2509
/branches/07x/074/org/w3c/dom/svg.js:2511-2556
/branches/07x/075/org/w3c/dom/svg.js:2558-2597
/branches/07x/076/org/w3c/dom/svg.js:2600-2631,2642
/branches/ufltima/dom/svg.js:1621-1856

• 前の記事 [Sie-announce] SIEコード [2642] stop-colorに対して、currentColorの値をサポートした
• 次の記事 [Sie-announce] SIEコード [2644]
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]