Changeset 31162 in webkit

Timestamp:

Mar 19, 2008 3:28:07 PM (16 years ago)

Author:

oliver@apple.com

Message:

Bug 17954: Canvas arc() with radius of 0 throws exception
​http://bugs.webkit.org/show_bug.cgi?id=17954

Reviewed by Antti

Simple fix -- use >= instead of > when validating the radius.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-with-incorrect-args-expected.txt (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-with-incorrect-args.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CanvasRenderingContext2D.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-19  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Antti.
+
+        Test case for Canvas.arc with zero-length radius needed to 
+        be updated for current html5 spec.
+
+        * fast/canvas/canvas-with-incorrect-args-expected.txt:
+        * fast/canvas/canvas-with-incorrect-args.html:
+
 2008-03-19  Justin Garcia  <justin.garcia@apple.com>
 

trunk/LayoutTests/fast/canvas/canvas-with-incorrect-args-expected.txt

@@ -15 +15 @@
 UNDEFINED threw exception code 1 on nan*nan rect.
 PASS called fill with an empty path without throwing an exception.
-PASS threw exception code 1 on arc with zero-length radius
+PASS did not throw exception on arc with zero-length radius
 PASS threw exception code 1 on arc with negative-length radius
 UNDEFINED did not throw exception on arc with infinite radius

trunk/LayoutTests/fast/canvas/canvas-with-incorrect-args.html

@@ -95 +95 @@
     try {
         context.arc(2, 2, 0, 0, 90, true);
-        fail("did not throw exception on arc with zero-length radius");
-    } catch (e) {
-        pass("threw exception code " + e.code + " on arc with zero-length radius");    
+        pass("did not throw exception on arc with zero-length radius");
+    } catch (e) {
+        fail("threw exception code " + e.code + " on arc with zero-length radius");    
     }
     try {

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-19  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Antti.
+
+        Bug 17954: Canvas arc() with radius of 0 throws exception
+        http://bugs.webkit.org/show_bug.cgi?id=17954
+
+        Simple fix -- use >= instead of > when validating the radius.
+
+        * html/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::arc):
+
 2008-03-19  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/html/CanvasRenderingContext2D.cpp

@@ -469 +469 @@
 {
     ec = 0;
-    if (!(r > 0)) {
+    if (!(r >= 0)) {
         ec = INDEX_SIZE_ERR;
         return;