Changeset 87732 in webkit

Timestamp:

May 31, 2011 9:15:27 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-05-31 Andreas Kling <​kling@webkit.org>

Reviewed by Antti Koivisto.

Canvas/JSC: Auto-generate overloads for setFillColor()
​https://bugs.webkit.org/show_bug.cgi?id=61635

Move CanvasRenderingContext2D.setStrokeColor() to auto-generated JSC bindings.

There is a subtle difference to the previous behavior: invalid numbers of
arguments now raise TypeError instead of SyntaxError. This is in accordance
with Web IDL, but doesn't matter much anyway since this method is WebKit-only.

Test: fast/canvas/canvas-overloads-setFillColor.html

• bindings/js/JSCanvasRenderingContext2DCustom.cpp:
• html/canvas/CanvasRenderingContext2D.idl:

2011-05-31 Andreas Kling <​kling@webkit.org>

Reviewed by Antti Koivisto.

Canvas/JSC: Auto-generate overloads for setFillColor()
​https://bugs.webkit.org/show_bug.cgi?id=61635

Add a test to verify the behavior of setFillColor() when called with
different numbers of arguments.

• fast/canvas/canvas-overloads-setFillColor-expected.txt: Added.
• fast/canvas/canvas-overloads-setFillColor.html: Added.
• fast/canvas/script-tests/canvas-overloads-setFillColor.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-overloads-setFillColor-expected.txt (added)
• LayoutTests/fast/canvas/canvas-overloads-setFillColor.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-overloads-setFillColor.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-31  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Antti Koivisto.
+
+        Canvas/JSC: Auto-generate overloads for setFillColor()
+        https://bugs.webkit.org/show_bug.cgi?id=61635
+
+        Add a test to verify the behavior of setFillColor() when called with
+        different numbers of arguments.
+
+        * fast/canvas/canvas-overloads-setFillColor-expected.txt: Added.
+        * fast/canvas/canvas-overloads-setFillColor.html: Added.
+        * fast/canvas/script-tests/canvas-overloads-setFillColor.js: Added.
+
 2011-05-31  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-31  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Antti Koivisto.
+
+        Canvas/JSC: Auto-generate overloads for setFillColor()
+        https://bugs.webkit.org/show_bug.cgi?id=61635
+
+        Move CanvasRenderingContext2D.setStrokeColor() to auto-generated JSC bindings.
+
+        There is a subtle difference to the previous behavior: invalid numbers of
+        arguments now raise TypeError instead of SyntaxError. This is in accordance
+        with Web IDL, but doesn't matter much anyway since this method is WebKit-only.
+
+        Test: fast/canvas/canvas-overloads-setFillColor.html
+
+        * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
+        * html/canvas/CanvasRenderingContext2D.idl:
+
 2011-05-31  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp

@@ -95 +95 @@
     context->setFillStyle(toHTMLCanvasStyle(exec, value));
 }
-
-JSValue JSCanvasRenderingContext2D::setFillColor(ExecState* exec)
-{
-    CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(impl());
-
-    // string arg = named color
-    // number arg = gray color
-    // string arg, number arg = named color, alpha
-    // number arg, number arg = gray color, alpha
-    // 4 args = r, g, b, a
-    // 5 args = c, m, y, k, a
-    switch (exec->argumentCount()) {
-        case 1:
-            if (exec->argument(0).isString())
-                context->setFillColor(ustringToString(asString(exec->argument(0))->value(exec)));
-            else
-                context->setFillColor(exec->argument(0).toFloat(exec));
-            break;
-        case 2:
-            if (exec->argument(0).isString())
-                context->setFillColor(ustringToString(asString(exec->argument(0))->value(exec)), exec->argument(1).toFloat(exec));
-            else
-                context->setFillColor(exec->argument(0).toFloat(exec), exec->argument(1).toFloat(exec));
-            break;
-        case 4:
-            context->setFillColor(exec->argument(0).toFloat(exec), exec->argument(1).toFloat(exec),
-                                  exec->argument(2).toFloat(exec), exec->argument(3).toFloat(exec));
-            break;
-        case 5:
-            context->setFillColor(exec->argument(0).toFloat(exec), exec->argument(1).toFloat(exec),
-                                  exec->argument(2).toFloat(exec), exec->argument(3).toFloat(exec), exec->argument(4).toFloat(exec));
-            break;
-        default:
-            return throwSyntaxError(exec);
-    }
-    return jsUndefined();
-}    
 
 JSValue JSCanvasRenderingContext2D::strokeRect(ExecState* exec)

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl

@@ -108 +108 @@
         void setStrokeColor(in float c, in float m, in float y, in float k, in float a);
 
-#if defined(V8_BINDING) && V8_BINDING
         void setFillColor(in DOMString color, in [Optional] float alpha);
         void setFillColor(in float grayLevel, in [Optional] float alpha);
@@ -114 +113 @@
         void setFillColor(in float c, in float m, in float y, in float k, in float a);
 
+#if defined(V8_BINDING) && V8_BINDING
         void strokeRect(in float x, in float y, in float width, in float height, in [Optional] float lineWidth);
 
@@ -157 +157 @@
 #else
         // FIXME: Remove 'else' once JSC supports overloads too.
-        [Custom] void setFillColor(/* 1 */);
         [Custom] void strokeRect(/* 4 */);
         [Custom] void drawImage(/* 3 */);