Changeset 16993 in webkit

Timestamp:

Oct 11, 2006, 11:27:49 AM (18 years ago)

Author:

oliver

Message:

2006-10-11 Oliver Hunt <​oliver@apple.com>

Reviewed by Adam.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=11251
Corrects canvas tag to not throw JS exception when drawing
zero sized rects, arcs, etc

• html/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::arcTo): (WebCore::CanvasRenderingContext2D::arc): (WebCore::CanvasRenderingContext2D::rect): (WebCore::CanvasRenderingContext2D::clearRect): (WebCore::CanvasRenderingContext2D::fillRect): (WebCore::CanvasRenderingContext2D::strokeRect):

Reviewed by Geoff.

Test case for ​http://bugs.webkit.org/show_bug.cgi?id=11251

• fast/canvas/zero-size-fill-rect-expected.checksum: Added.
• fast/canvas/zero-size-fill-rect-expected.png: Added.
• fast/canvas/zero-size-fill-rect-expected.txt: Added.
• fast/canvas/zero-size-fill-rect.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/zero-size-fill-rect-expected.checksum (added)
• LayoutTests/fast/canvas/zero-size-fill-rect-expected.png (added)
• LayoutTests/fast/canvas/zero-size-fill-rect-expected.txt (added)
• LayoutTests/fast/canvas/zero-size-fill-rect.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CanvasRenderingContext2D.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-10-11  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Geoff.
+
+        Test case for http://bugs.webkit.org/show_bug.cgi?id=11251
+
+        * fast/canvas/zero-size-fill-rect-expected.checksum: Added.
+        * fast/canvas/zero-size-fill-rect-expected.png: Added.
+        * fast/canvas/zero-size-fill-rect-expected.txt: Added.
+        * fast/canvas/zero-size-fill-rect.html: Added.
+
 2006-10-11  Rob Buis  <buis@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-10-11  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Adam.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=11251
+        Corrects canvas tag to not throw JS exception when drawing
+        zero sized rects, arcs, etc
+
+        * html/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::arcTo):
+        (WebCore::CanvasRenderingContext2D::arc):
+        (WebCore::CanvasRenderingContext2D::rect):
+        (WebCore::CanvasRenderingContext2D::clearRect):
+        (WebCore::CanvasRenderingContext2D::fillRect):
+        (WebCore::CanvasRenderingContext2D::strokeRect):
+
 2006-10-11  Rob Buis  <buis@kde.org>
 

trunk/WebCore/html/CanvasRenderingContext2D.cpp

@@ -388 +388 @@
 {
     ec = 0;
-    if (!(r > 0)) {
+    if (r < 0) {
         ec = INDEX_SIZE_ERR;
         return;
@@ -398 +398 @@
 {
     ec = 0;
-    if (!(r > 0)) {
+    if (r < 0) {
         ec = INDEX_SIZE_ERR;
         return;
@@ -408 +408 @@
 {
     ec = 0;
-    if (!(width > 0 && height > 0)) {
+    if (width < 0 || height < 0) {
         ec = INDEX_SIZE_ERR;
         return;
@@ -483 +483 @@
 {
     ec = 0;
-    if (!(width > 0 && height > 0)) {
+    if (width < 0 || height < 0) {
         ec = INDEX_SIZE_ERR;
         return;
@@ -499 +499 @@
     ec = 0;
 
-    if (!(width > 0 && height > 0)) {
+    if (width < 0 || height < 0) {
         ec = INDEX_SIZE_ERR;
         return;
@@ -536 +536 @@
     ec = 0;
 
-    if (!(width > 0 && height > 0 && lineWidth > 0)) {
+    if (width < 0 || height < 0 || lineWidth < 0) {
         ec = INDEX_SIZE_ERR;
         return;