Changeset 47398 in webkit

Timestamp:

Aug 17, 2009 5:05:55 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-17 Benjamin C Meyer <​benjamin.meyer@torchmobile.com>

Reviewed by Darin Adler.

Fix createImageData to raise the NOT_SUPPORTED_ERR exception when
either of the arguments are not finite.

According to
​http://www.whatwg.org/specs/web-apps/current-work/#pixel-manipulation:
"If any of the arguments to createImageData() or getImageData() are
infinite or NaN, or if the createImageData() method is invoked with
only one argument but that argument is null, the method must instead
raise a NOT_SUPPORTED_ERR exception."

Test: ​http://philip.html5.org/tests/canvas/suite/tests/2d.imageData.create.nonfinite.html

• fast/canvas/canvas-2d-imageData-create-nonfinite-expected.txt: Added.
• fast/canvas/canvas-2d-imageData-create-nonfinite.html: Added.
• fast/canvas/resources/canvas-2d-imageData-create-nonfinite.js: Added.

2009-08-17 Benjamin C Meyer <​benjamin.meyer@torchmobile.com>

Reviewed by Darin Adler.

Fix createImageData to raise the NOT_SUPPORTED_ERR exception when
either of the arguments are not finite.

According to
​http://www.whatwg.org/specs/web-apps/current-work/#pixel-manipulation:
"If any of the arguments to createImageData() or getImageData() are
infinite or NaN, or if the createImageData() method is invoked with
only one argument but that argument is null, the method must instead
raise a NOT_SUPPORTED_ERR exception."

Test: ​http://philip.html5.org/tests/canvas/suite/tests/2d.imageData.create.nonfinite.html

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-2d-imageData-create-nonfinite-expected.txt (added)
• LayoutTests/fast/canvas/canvas-2d-imageData-create-nonfinite.html (added)
• LayoutTests/fast/canvas/resources/canvas-2d-imageData-create-nonfinite.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.h (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-17  Benjamin C Meyer  <benjamin.meyer@torchmobile.com>
+
+        Reviewed by Darin Adler.
+
+        Fix createImageData to raise the NOT_SUPPORTED_ERR exception when
+        either of the arguments are not finite.
+
+        According to
+        http://www.whatwg.org/specs/web-apps/current-work/#pixel-manipulation:
+        "If any of the arguments to createImageData() or getImageData() are
+        infinite or NaN, or if the createImageData()  method is invoked with
+        only one argument but that argument is null, the method must instead
+        raise a NOT_SUPPORTED_ERR  exception."
+
+        Test: http://philip.html5.org/tests/canvas/suite/tests/2d.imageData.create.nonfinite.html
+
+        * fast/canvas/canvas-2d-imageData-create-nonfinite-expected.txt: Added.
+        * fast/canvas/canvas-2d-imageData-create-nonfinite.html: Added.
+        * fast/canvas/resources/canvas-2d-imageData-create-nonfinite.js: Added.
+
 2009-08-17  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-17  Benjamin C Meyer  <benjamin.meyer@torchmobile.com>
+
+        Reviewed by Darin Adler.
+
+        Fix createImageData to raise the NOT_SUPPORTED_ERR exception when
+        either of the arguments are not finite.
+
+        According to
+        http://www.whatwg.org/specs/web-apps/current-work/#pixel-manipulation:
+        "If any of the arguments to createImageData() or getImageData() are
+        infinite or NaN, or if the createImageData()  method is invoked with
+        only one argument but that argument is null, the method must instead
+        raise a NOT_SUPPORTED_ERR  exception."
+
+        Test: http://philip.html5.org/tests/canvas/suite/tests/2d.imageData.create.nonfinite.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::createImageData):
+        * html/canvas/CanvasRenderingContext2D.h:
+        * html/canvas/CanvasRenderingContext2D.idl:
+
 2009-08-17  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1279 +1279 @@
 }
 
-PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh) const
-{
+PassRefPtr<ImageData> CanvasRenderingContext2D::createImageData(float sw, float sh, ExceptionCode& ec) const
+{
+    ec = 0;
+    if (!isfinite(sw) || !isfinite(sh)) {
+        ec = NOT_SUPPORTED_ERR;
+        return 0;
+    }
     FloatSize unscaledSize(sw, sh);
     IntSize scaledSize = m_canvas->convertLogicalToDevice(unscaledSize);

trunk/WebCore/html/canvas/CanvasRenderingContext2D.h

@@ -179 +179 @@
         PassRefPtr<CanvasPattern> createPattern(HTMLCanvasElement*, const String& repetitionType, ExceptionCode&);
         
-        PassRefPtr<ImageData> createImageData(float width, float height) const;
+        PassRefPtr<ImageData> createImageData(float width, float height, ExceptionCode&) const;
         PassRefPtr<ImageData> getImageData(float sx, float sy, float sw, float sh, ExceptionCode&) const;
         void putImageData(ImageData*, float dx, float dy, ExceptionCode&);

trunk/WebCore/html/canvas/CanvasRenderingContext2D.idl

@@ -114 +114 @@
         
         // pixel manipulation
-        ImageData createImageData(in float sw, in float sh);
+        ImageData createImageData(in float sw, in float sh)
+            raises (DOMException);
         ImageData getImageData(in float sx, in float sy, in float sw, in float sh)
             raises(DOMException);