Correct incorrect assertion

Reviewed by Mark Rowe

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 444b4b74af71b3f008953b775fb1281719f4a86d..628259397a89f08c981ad5b151862c98ad75bf2a 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+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>
 
         Reviewed by Dave Hyatt.

diff --git a/LayoutTests/fast/canvas/canvas-putImageData.js b/LayoutTests/fast/canvas/canvas-putImageData.js
index c56f4bceba08d1969435ae5d9776d30e89801723..c8f65c16f99871f6ba94e1921abee75e8b8f41f8 100644 (file)
--- a/LayoutTests/fast/canvas/canvas-putImageData.js
+++ b/LayoutTests/fast/canvas/canvas-putImageData.js
@@ -221,4 +221,17 @@ shouldThrow("context.putImageData(buffer, 0, 0, 0, undefined, 0, 0)", "'Error: I
 shouldThrow("context.putImageData(buffer, 0, 0, 0, 0, undefined, 0)", "'Error: INDEX_SIZE_ERR: DOM Exception 1'");
 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;

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3960aa74935c7a73200d6f627a785461ede2407f..4ad90bd6b7856feb3f10e023424315ecb6b24b7a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+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>
 
         Another fix for non-database builds after changes in r30331.

diff --git a/WebCore/platform/graphics/cg/ImageBufferCG.cpp b/WebCore/platform/graphics/cg/ImageBufferCG.cpp
index 2e48ceb3a8b0f8e2e1b4095d5f35fa43f6536a6b..eff61b92e6972dd788bb96696fcc9f44ca6bd1c6 100644 (file)
--- a/WebCore/platform/graphics/cg/ImageBufferCG.cpp
+++ b/WebCore/platform/graphics/cg/ImageBufferCG.cpp
@@ -182,7 +182,7 @@ void ImageBuffer::putImageData(ImageData* source, const IntRect& sourceRect, con
     ASSERT(originy <= sourceRect.bottom());
 
     int endy = destPoint.y() + sourceRect.bottom();
-    ASSERT(endx <= m_size.height());
+    ASSERT(endy <= m_size.height());
     int numRows = endy - desty;
 
     unsigned srcBytesPerRow = 4 * source->width();