git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7c9f102)
2006-10-11 Oliver Hunt <oliver@apple.com>
authoroliver <oliver@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Oct 2006 18:27:49 +0000 (18:27 +0000)
committeroliver <oliver@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Oct 2006 18:27:49 +0000 (18:27 +0000)
        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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/canvas/zero-size-fill-rect-expected.checksum [new file with mode: 0644] patch | blob
LayoutTests/fast/canvas/zero-size-fill-rect-expected.png [new file with mode: 0644] patch | blob
LayoutTests/fast/canvas/zero-size-fill-rect-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/fast/canvas/zero-size-fill-rect.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog patch | blob | history
WebCore/html/CanvasRenderingContext2D.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 34be4805b67c6c825c68aaf755df12645005e7ed..4e1920eaafc88d77e7bc0289bf383428aa6a5c4d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         Reviewed by Mitz.
diff --git a/LayoutTests/fast/canvas/zero-size-fill-rect-expected.checksum b/LayoutTests/fast/canvas/zero-size-fill-rect-expected.checksum
new file mode 100644 (file)
index 0000000..75fc244
--- /dev/null
+++ b/LayoutTests/fast/canvas/zero-size-fill-rect-expected.checksum
@@ -0,0 +1 @@
+62de2d21445b7cd4f98238302b39899a
\ No newline at end of file
diff --git a/LayoutTests/fast/canvas/zero-size-fill-rect-expected.png b/LayoutTests/fast/canvas/zero-size-fill-rect-expected.png
new file mode 100644 (file)
index 0000000..10b3e2f
Binary files /dev/null and b/LayoutTests/fast/canvas/zero-size-fill-rect-expected.png differ
diff --git a/LayoutTests/fast/canvas/zero-size-fill-rect-expected.txt b/LayoutTests/fast/canvas/zero-size-fill-rect-expected.txt
new file mode 100644 (file)
index 0000000..72ba8dc
--- /dev/null
+++ b/LayoutTests/fast/canvas/zero-size-fill-rect-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderHTMLCanvas {CANVAS} at (0,0) size 100x100
+      RenderText {#text} at (100,86) size 4x18
+        text run at (100,86) width 4: " "
+      RenderBR {BR} at (104,100) size 0x0
+      RenderText {#text} at (0,104) size 311x18
+        text run at (0,104) width 311: "PASS -- 0 sized rects did not trigger an exception"
diff --git a/LayoutTests/fast/canvas/zero-size-fill-rect.html b/LayoutTests/fast/canvas/zero-size-fill-rect.html
new file mode 100644 (file)
index 0000000..2cf7328
--- /dev/null
+++ b/LayoutTests/fast/canvas/zero-size-fill-rect.html
@@ -0,0 +1,37 @@
+<!--
+  Creates a canvas which is filled red, then attempts to
+  fill a number of 0 size rects, finally fills with green.
+
+  Fill of a 0-sized rect should not throw an exception, so 
+  we expected the output to be a green rect.
+-->
+<html>
+<head>
+<script type="text/javascript">
+window.onload = function() {
+    var canvas = document.getElementById("test");
+    var context = canvas.getContext("2d");
+    context.fillStyle = '#f00';
+    context.fillRect(0, 0, canvas.width, canvas.height);
+    try {
+        context.fillRect(0, 0, 0, 0);
+        context.fillRect(0, 0, canvas.width, 0);
+        context.fillRect(0, 0, 0, canvas.height);
+    } catch (e) {
+        var node = document.createTextNode("FAIL -- an exception was thrown when drawing a 0 sized rect");
+        document.getElementById("body").appendChild(node);
+        return;
+    }
+    context.fillStyle = '#0f0';
+    context.fillRect(0, 0, canvas.width, canvas.height);
+    var node = document.createTextNode("PASS -- 0 sized rects did not trigger an exception");
+    document.getElementById("body").appendChild(node);
+}
+</script>
+<title>borkedness</title>
+</head>
+<body id="body">
+<canvas id="test" width="100" height="100"></canvas>
+<br>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4ff832acdd7b51c8bb2cc9d0e97badcb44da8755..f950f962745b1f76f03eef7cd83a4d3ee6951496 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+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>
 
         Reviewed by Mitz.
diff --git a/WebCore/html/CanvasRenderingContext2D.cpp b/WebCore/html/CanvasRenderingContext2D.cpp
index f86b4f5e41b7631b90862ee5b9f12562c5a8371b..aca55d2e885169818647afdf3d88d84b727c51c4 100644 (file)
--- a/WebCore/html/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/CanvasRenderingContext2D.cpp
@@ -387,7 +387,7 @@ void CanvasRenderingContext2D::bezierCurveTo(float cp1x, float cp1y, float cp2x,
 void CanvasRenderingContext2D::arcTo(float x0, float y0, float x1, float y1, float r, ExceptionCode& ec)
 {
     ec = 0;
-    if (!(r > 0)) {
+    if (r < 0) {
         ec = INDEX_SIZE_ERR;
         return;
     }
@@ -397,7 +397,7 @@ void CanvasRenderingContext2D::arcTo(float x0, float y0, float x1, float y1, flo
 void CanvasRenderingContext2D::arc(float x, float y, float r, float sa, float ea, bool clockwise, ExceptionCode& ec)
 {
     ec = 0;
-    if (!(r > 0)) {
+    if (r < 0) {
         ec = INDEX_SIZE_ERR;
         return;
     }
@@ -407,7 +407,7 @@ void CanvasRenderingContext2D::arc(float x, float y, float r, float sa, float ea
 void CanvasRenderingContext2D::rect(float x, float y, float width, float height, ExceptionCode& ec)
 {
     ec = 0;
-    if (!(width > 0 && height > 0)) {
+    if (width < 0 || height < 0) {
         ec = INDEX_SIZE_ERR;
         return;
     }
@@ -482,7 +482,7 @@ void CanvasRenderingContext2D::clip()
 void CanvasRenderingContext2D::clearRect(float x, float y, float width, float height, ExceptionCode& ec)
 {
     ec = 0;
-    if (!(width > 0 && height > 0)) {
+    if (width < 0 || height < 0) {
         ec = INDEX_SIZE_ERR;
         return;
     }
@@ -498,7 +498,7 @@ void CanvasRenderingContext2D::fillRect(float x, float y, float width, float hei
 {
     ec = 0;
 
-    if (!(width > 0 && height > 0)) {
+    if (width < 0 || height < 0) {
         ec = INDEX_SIZE_ERR;
         return;
     }
@@ -535,7 +535,7 @@ void CanvasRenderingContext2D::strokeRect(float x, float y, float width, float h
 {
     ec = 0;
 
-    if (!(width > 0 && height > 0 && lineWidth > 0)) {
+    if (width < 0 || height < 0 || lineWidth < 0) {
         ec = INDEX_SIZE_ERR;
         return;
     }
Mirror of the WebKit open source project from svn.webkit.org.