Changeset 87729 in webkit

Timestamp:

May 31, 2011 9:08:49 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 fillText()
​https://bugs.webkit.org/show_bug.cgi?id=61623

Add a test to verify the behavior of fillText() when called with different
numbers of arguments. There are two differences to the previous behavior:

• SyntaxError exceptions are now raised with the message "Not enough arguments."
• Calling fillText() with superfluous arguments now lets the call through instead of raising a SyntaxError. This matches both Gecko and Presto.

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

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

Reviewed by Antti Koivisto.

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

Move CanvasRenderingContext2D.fillText() to auto-generated JSC bindings.
Make it [RequiresAllArguments=Raise] to match the old behavior.
This has the side-effect of aligning the behaviors of JSC and V8.

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

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-31  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Antti Koivisto.
+
+        Canvas/JSC: Auto-generate overloads for fillText()
+        https://bugs.webkit.org/show_bug.cgi?id=61623
+
+        Add a test to verify the behavior of fillText() when called with different
+        numbers of arguments. There are two differences to the previous behavior:
+
+        - SyntaxError exceptions are now raised with the message "Not enough arguments."
+        - Calling fillText() with superfluous arguments now lets the call through
+          instead of raising a SyntaxError. This matches both Gecko and Presto.
+
+        * fast/canvas/canvas-overloads-fillText-expected.txt: Added.
+        * fast/canvas/canvas-overloads-fillText.html: Added.
+        * fast/canvas/script-tests/canvas-overloads-fillText.js: Added.
+
 2011-05-31  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-31  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Antti Koivisto.
+
+        Canvas/JSC: Auto-generate overloads for fillText()
+        https://bugs.webkit.org/show_bug.cgi?id=61623
+
+        Move CanvasRenderingContext2D.fillText() to auto-generated JSC bindings.
+        Make it [RequiresAllArguments=Raise] to match the old behavior.
+        This has the side-effect of aligning the behaviors of JSC and V8.
+
+        Test: fast/canvas/canvas-overloads-fillText.html
+
+        * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
+        * html/canvas/CanvasRenderingContext2D.idl:
+
 2011-05-31  Yael Aharon  <yael.aharon@nokia.com>
 

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

@@ -410 +410 @@
 }
 
-JSValue JSCanvasRenderingContext2D::fillText(ExecState* exec)
+JSValue JSCanvasRenderingContext2D::strokeText(ExecState* exec)
 { 
     CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(impl());
@@ -422 +422 @@
     
     if (exec->argumentCount() == 4)
-        context->fillText(ustringToString(exec->argument(0).toString(exec)), exec->argument(1).toFloat(exec), exec->argument(2).toFloat(exec), exec->argument(3).toFloat(exec));
-    else
-        context->fillText(ustringToString(exec->argument(0).toString(exec)), exec->argument(1).toFloat(exec), exec->argument(2).toFloat(exec));
-    return jsUndefined();
-}
-
-JSValue JSCanvasRenderingContext2D::strokeText(ExecState* exec)
-{ 
-    CanvasRenderingContext2D* context = static_cast<CanvasRenderingContext2D*>(impl());
-
-    // string arg = text to draw
-    // number arg = x
-    // number arg = y
-    // optional number arg = maxWidth
-    if (exec->argumentCount() < 3 || exec->argumentCount() > 4)
-        return throwSyntaxError(exec);
-    
-    if (exec->argumentCount() == 4)
         context->strokeText(ustringToString(exec->argument(0).toString(exec)), exec->argument(1).toFloat(exec), exec->argument(2).toFloat(exec), exec->argument(3).toFloat(exec));
     else

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

@@ -100 +100 @@
         void clearShadow();
 
+        [RequiresAllArguments=Raise] void fillText(in DOMString text, in float x, in float y, in [Optional] float maxWidth);
+
 #if defined(V8_BINDING) && V8_BINDING
-        void fillText(in DOMString text, in float x, in float y, in [Optional] float maxWidth);
         void strokeText(in DOMString text, in float x, in float y, in [Optional] float maxWidth);
 
@@ -157 +158 @@
 #else
         // FIXME: Remove 'else' once JSC supports overloads too.
-        [Custom] void fillText(/* 4 */);
         [Custom] void strokeText(/* 4 */);
         [Custom] void setStrokeColor(/* 1  */);