Changeset 87933 in webkit

Timestamp:

Jun 2, 2011 11:27:27 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-06-02 Andreas Kling <​kling@webkit.org>

Reviewed by James Robinson.

Canvas/V8: Fix setting strokeStyle or fillStyle to a CSS system color.
​https://bugs.webkit.org/show_bug.cgi?id=61944

• platform/chromium/test_expectations.txt: Unskip canvas/philip/tests/2d.fillStyle.parse.system.html.

2011-06-02 Andreas Kling <​kling@webkit.org>

Reviewed by James Robinson.

Canvas/V8: Fix setting strokeStyle or fillStyle to a CSS system color.
​https://bugs.webkit.org/show_bug.cgi?id=61944

Call setFillColor/setStrokeColor (instead of setFillStyle/setStrokeStyle)
for string styles. This ensures that system color resolution is performed,
and matches what the JSC bindings do.

Test: canvas/philip/tests/2d.fillStyle.parse.system.html

• bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp: (WebCore::toCanvasStyle): (WebCore::V8CanvasRenderingContext2D::strokeStyleAccessorSetter): (WebCore::V8CanvasRenderingContext2D::fillStyleAccessorSetter):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-02  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by James Robinson.
+
+        Canvas/V8: Fix setting strokeStyle or fillStyle to a CSS system color.
+        https://bugs.webkit.org/show_bug.cgi?id=61944
+
+        * platform/chromium/test_expectations.txt: Unskip canvas/philip/tests/2d.fillStyle.parse.system.html.
+
 2011-06-02  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2009 +2009 @@
 BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html = TEXT
 BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html = TEXT
-BUGWK39168 : canvas/philip/tests/2d.fillStyle.parse.system.html = TEXT
 BUGWK45991 : canvas/philip/tests/2d.pattern.image.undefined.html = TEXT
 BUGWK45991 : canvas/philip/tests/2d.text.draw.baseline.bottom.html = TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-02  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by James Robinson.
+
+        Canvas/V8: Fix setting strokeStyle or fillStyle to a CSS system color.
+        https://bugs.webkit.org/show_bug.cgi?id=61944
+
+        Call setFillColor/setStrokeColor (instead of setFillStyle/setStrokeStyle)
+        for string styles. This ensures that system color resolution is performed,
+        and matches what the JSC bindings do.
+
+        Test: canvas/philip/tests/2d.fillStyle.parse.system.html
+
+        * bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp:
+        (WebCore::toCanvasStyle):
+        (WebCore::V8CanvasRenderingContext2D::strokeStyleAccessorSetter):
+        (WebCore::V8CanvasRenderingContext2D::fillStyleAccessorSetter):
+
 2011-06-02  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp

@@ -63 +63 @@
 static PassRefPtr<CanvasStyle> toCanvasStyle(v8::Handle<v8::Value> value)
 {
-    if (value->IsString())
-        return CanvasStyle::createFromString(toWebCoreString(value));
-
     if (V8CanvasGradient::HasInstance(value))
         return CanvasStyle::createFromGradient(V8CanvasGradient::toNative(v8::Handle<v8::Object>::Cast(value)));
@@ -84 +81 @@
 {
     CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.Holder());
-    impl->setStrokeStyle(toCanvasStyle(value));
+    if (value->IsString())
+        impl->setStrokeColor(toWebCoreString(value));
+    else
+        impl->setStrokeStyle(toCanvasStyle(value));
 }
 
@@ -96 +96 @@
 {
     CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.Holder());
-    impl->setFillStyle(toCanvasStyle(value));
+    if (value->IsString())
+        impl->setFillColor(toWebCoreString(value));
+    else
+        impl->setFillStyle(toCanvasStyle(value));
 }