Changeset 68176 in webkit

Timestamp:

Sep 23, 2010 12:15:48 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-23 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Oliver Hunt.

context.drawImage with (source rect's height) = -(input image's native height) draws nothing
​https://bugs.webkit.org/show_bug.cgi?id=46243

These test simply exercise using negative widths and heights for the source rect in ctx.drawImage calls.

• canvas/philip/tests/2d.drawImage.negativeSourceHeight-expected.txt: Added.
• canvas/philip/tests/2d.drawImage.negativeSourceHeight.html: Added.
• canvas/philip/tests/2d.drawImage.negativeSourceHeight2-expected.txt: Added.
• canvas/philip/tests/2d.drawImage.negativeSourceHeight2.html: Added.
• canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth-expected.txt: Added.
• canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth.html: Added.

2010-09-23 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Oliver Hunt.

context.drawImage with (source rect's height) = -(input image's native height) draws nothing
​https://bugs.webkit.org/show_bug.cgi?id=46243

This patch changes canvasrenderingcontext2d's drawImage with an image element to
normalize the source and dest rects to acheive the desired canvas spec behavior
of allowing negative widths and heights that don't cause flipping and fix the
adverse behavior of specifying a source rect height of negative the source image's height

Tests: canvas/philip/tests/2d.drawImage.negativeSourceHeight.html

canvas/philip/tests/2d.drawImage.negativeSourceHeight2.html
canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth.html

• html/canvas/CanvasRenderingContext2D.cpp: Normalize rects in drawImage before calling lower level draw calls.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/canvas/philip/tests/2d.drawImage.negativeSourceHeight-expected.txt (added)
• LayoutTests/canvas/philip/tests/2d.drawImage.negativeSourceHeight.html (added)
• LayoutTests/canvas/philip/tests/2d.drawImage.negativeSourceHeight2-expected.txt (added)
• LayoutTests/canvas/philip/tests/2d.drawImage.negativeSourceHeight2.html (added)
• LayoutTests/canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth-expected.txt (added)
• LayoutTests/canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-23  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        context.drawImage with (source rect's height) = -(input image's native height) draws nothing
+        https://bugs.webkit.org/show_bug.cgi?id=46243
+
+        These test simply exercise using negative widths and heights for the source rect in ctx.drawImage calls.
+
+        * canvas/philip/tests/2d.drawImage.negativeSourceHeight-expected.txt: Added.
+        * canvas/philip/tests/2d.drawImage.negativeSourceHeight.html: Added.
+        * canvas/philip/tests/2d.drawImage.negativeSourceHeight2-expected.txt: Added.
+        * canvas/philip/tests/2d.drawImage.negativeSourceHeight2.html: Added.
+        * canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth-expected.txt: Added.
+        * canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth.html: Added.
+
 2010-09-23  Nate Chapin  <japhet@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-23  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        context.drawImage with (source rect's height) = -(input image's native height) draws nothing
+        https://bugs.webkit.org/show_bug.cgi?id=46243
+
+        This patch changes canvasrenderingcontext2d's drawImage with an image element to
+        normalize the source and dest rects to acheive the desired canvas spec behavior
+        of allowing negative widths and heights that don't cause flipping and fix the
+        adverse behavior of specifying a source rect height of negative the source image's height
+
+        Tests: canvas/philip/tests/2d.drawImage.negativeSourceHeight.html
+               canvas/philip/tests/2d.drawImage.negativeSourceHeight2.html
+               canvas/philip/tests/2d.drawImage.negativeSourceHeightAndWidth.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp: Normalize rects in drawImage before calling
+        lower level draw calls.
+
 2010-09-23  Renata Hodovan  <reni@inf.u-szeged.hu>
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1187 +1187 @@
         return;
 
+    if (!dstRect.width() || !dstRect.height())
+        return;
+
     if (!image->complete())
         return;
 
+    FloatRect normalizedSrcRect = normalizeRect(srcRect);
+    FloatRect normalizedDstRect = normalizeRect(dstRect);
+
     FloatRect imageRect = FloatRect(FloatPoint(), size(image));
-    if (!imageRect.contains(normalizeRect(srcRect)) || !srcRect.width() || !srcRect.height()) {
+    if (!imageRect.contains(normalizedSrcRect) || !srcRect.width() || !srcRect.height()) {
         ec = INDEX_SIZE_ERR;
         return;
     }
-
-    if (!dstRect.width() || !dstRect.height())
-        return;
 
     GraphicsContext* c = drawingContext();
@@ -1215 +1218 @@
         canvas()->setOriginTainted();
 
-    FloatRect sourceRect = c->roundToDevicePixels(srcRect);
-    FloatRect destRect = c->roundToDevicePixels(dstRect);
+    FloatRect sourceRect = c->roundToDevicePixels(normalizedSrcRect);
+    FloatRect destRect = c->roundToDevicePixels(normalizedDstRect);
     c->drawImage(cachedImage->image(), DeviceColorSpace, destRect, sourceRect, state().m_globalComposite);
     didDraw(destRect);