Changeset 59561 in webkit

Timestamp:

May 15, 2010 7:22:51 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-05-15 Chang Shu <​chang.shu@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

Based on the spec and Philip Taylor's test suite, createImageData() should throw
an INDEX_SIZE_ERR exception if either the sw or sh arguments are zero.
The link to the spec:
​http://philip.html5.org/tests/canvas/suite/tests/spec.html#testrefs.2d.imageData.getcreate.zero

​https://bugs.webkit.org/show_bug.cgi?id=39166

The complete test suite is in the process of checking in.
​https://bugs.webkit.org/show_bug.cgi?id=20553

• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::createImageData):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-15  Chang Shu  <chang.shu@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Based on the spec and Philip Taylor's test suite, createImageData() should throw
+        an INDEX_SIZE_ERR exception if either the sw or sh arguments are zero.
+        The link to the spec:
+        http://philip.html5.org/tests/canvas/suite/tests/spec.html#testrefs.2d.imageData.getcreate.zero
+
+        https://bugs.webkit.org/show_bug.cgi?id=39166
+
+        The complete test suite is in the process of checking in.
+        https://bugs.webkit.org/show_bug.cgi?id=20553
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::createImageData):
+
 2010-05-15  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1350 +1350 @@
         return 0;
     }
+    if (!sw || !sh) {
+        ec = INDEX_SIZE_ERR;
+        return 0;
+    }
+
     FloatSize unscaledSize(sw, sh);
     IntSize scaledSize = canvas()->convertLogicalToDevice(unscaledSize);