Changeset 61970 in webkit

Timestamp:

Jun 27, 2010 10:10:10 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-27 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

Canvas: Ignore calls to drawImage() with non-finite parameters
​https://bugs.webkit.org/show_bug.cgi?id=38929

Rebaseline (and unskip for Qt) the now working test.

Spec link:
​http://www.whatwg.org/specs/web-apps/current-work/#2dcontext

• canvas/philip/tests/2d.drawImage.nonfinite-expected.txt:
• platform/qt/Skipped:

2010-06-27 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Darin Adler.

Canvas: Ignore calls to drawImage() with non-finite parameters
​https://bugs.webkit.org/show_bug.cgi?id=38929

This also fixes a Qt assert when using the raster graphics system.

Spec link:
​http://www.whatwg.org/specs/web-apps/current-work/#2dcontext

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/canvas/philip/tests/2d.drawImage.nonfinite-expected.txt (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-27  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Canvas: Ignore calls to drawImage() with non-finite parameters
+        https://bugs.webkit.org/show_bug.cgi?id=38929
+
+        Rebaseline (and unskip for Qt) the now working test.
+
+        Spec link:
+        http://www.whatwg.org/specs/web-apps/current-work/#2dcontext
+
+        * canvas/philip/tests/2d.drawImage.nonfinite-expected.txt:
+        * platform/qt/Skipped:
+
 2010-06-27  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/LayoutTests/canvas/philip/tests/2d.drawImage.nonfinite-expected.txt

@@ -6 +6 @@
 Expected output:
 
-Aborted with exception: INDEX_SIZE_ERR: DOM Exception 1
+Passed
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5349 +5349 @@
 canvas/philip/tests/security.pattern.image.strokeStyle.html
 canvas/philip/tests/security.reset.html
-canvas/philip/tests/2d.drawImage.nonfinite.html
 canvas/philip/tests/2d.drawImage.broken.html
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-27  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Canvas: Ignore calls to drawImage() with non-finite parameters
+        https://bugs.webkit.org/show_bug.cgi?id=38929
+
+        This also fixes a Qt assert when using the raster graphics system.
+
+        Spec link:
+        http://www.whatwg.org/specs/web-apps/current-work/#2dcontext
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::drawImage):
+
 2010-06-27  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1018 +1018 @@
     ec = 0;
 
+    if (!isfinite(dstRect.x()) || !isfinite(dstRect.y()) || !isfinite(dstRect.width()) || !isfinite(dstRect.height())
+        || !isfinite(srcRect.x()) || !isfinite(srcRect.y()) || !isfinite(srcRect.width()) || !isfinite(srcRect.height()))
+        return;
+
     FloatRect imageRect = FloatRect(FloatPoint(), size(image));
     if (!imageRect.contains(normalizeRect(srcRect)) || srcRect.width() == 0 || srcRect.height() == 0) {