Changeset 30710 in webkit

Timestamp:

Mar 3, 2008 12:17:08 AM (16 years ago)

Author:

oliver@apple.com

Message:

Correct incorrect assertion

Reviewed by Mark Rowe

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-putImageData.js (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cg/ImageBufferCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-03  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Test case for incorrect assertions
+
+        * fast/canvas/canvas-putImageData.js:
+
 2008-03-02  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/LayoutTests/fast/canvas/canvas-putImageData.js

@@ -222 +222 @@
 shouldThrow("context.putImageData(buffer, 0, 0, 0, 0, 0, undefined)", "'Error: INDEX_SIZE_ERR: DOM Exception 1'");
 
+// Ensure we don't mess up bounds clipping checks
+var rectcanvas = document.createElement("canvas");
+rectcanvas.width = 20;
+rectcanvas.height = 10;
+var rectbuffer = rectcanvas.getContext("2d");
+rectbuffer.putImageData(smallbuffer, 10, 0);
+
+var rectcanvas = document.createElement("canvas");
+rectcanvas.width = 10;
+rectcanvas.height = 20;
+var rectbuffer = rectcanvas.getContext("2d");
+rectbuffer.putImageData(smallbuffer, 0, 10);
+
 var successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-03  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Correct incorrect assertion
+
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::ImageBuffer::putImageData):
+
 2008-03-02  Alp Toker  <alp@atoker.com>
 

trunk/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -183 +183 @@
 
     int endy = destPoint.y() + sourceRect.bottom();
-    ASSERT(endx <= m_size.height());
+    ASSERT(endy <= m_size.height());
     int numRows = endy - desty;