Changeset 56619 in webkit

Timestamp:

Mar 26, 2010 5:58:06 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-26 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] fast/canvas/drawImage-with-negative-source-destination.html failed
​https://bugs.webkit.org/show_bug.cgi?id=35005

Enable fast/canvas/drawImage-with-negative-source-destination.html

• platform/qt/Skipped:

2010-03-26 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] fast/canvas/drawImage-with-negative-source-destination.html failed
​https://bugs.webkit.org/show_bug.cgi?id=35005

To support negative width or height at context.drawImage

• platform/graphics/qt/StillImageQt.cpp: (WebCore::StillImage::draw):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/StillImageQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-26  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] fast/canvas/drawImage-with-negative-source-destination.html failed
+        https://bugs.webkit.org/show_bug.cgi?id=35005
+
+        Enable fast/canvas/drawImage-with-negative-source-destination.html
+
+        * platform/qt/Skipped:
+
 2010-03-26  Mads Ager  <ager@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5162 +5162 @@
 fast/events/onbeforeunload-focused-iframe.html
 
-# [Qt] REGRESSION(r54811) fast/canvas/drawImage-with-negative-source-destination.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=35005
-fast/canvas/drawImage-with-negative-source-destination.html
-
 # Qt may want to follow GTK+ in adding a default Accept header for
 # subresources. See https://bugs.webkit.org/show_bug.cgi?id=33242.

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-26  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] fast/canvas/drawImage-with-negative-source-destination.html failed
+        https://bugs.webkit.org/show_bug.cgi?id=35005
+
+        To support negative width or height at context.drawImage
+
+        * platform/graphics/qt/StillImageQt.cpp:
+        (WebCore::StillImage::draw):
+
 2010-03-08  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/platform/graphics/qt/StillImageQt.cpp

@@ -58 +58 @@
     ctxt->save();
     ctxt->setCompositeOperation(op);
+
+    // To support width or height is negative
+    float sx = src.x();
+    float sy = src.y();
+    float sw = src.width();
+    float sh = src.height();
+
+    if (sw < 0) {
+        sx = sx + sw;
+        sw = -sw;
+    }
+
+    if (sh < 0) {
+        sy = sy + sh;
+        sh = -sh;
+    }
+
+    float dx = dst.x();
+    float dy = dst.y();
+    float dw = dst.width();
+    float dh = dst.height();
+
+    if (dw < 0) {
+        dx = dx + dw;
+        dw = -dw;
+    }
+
+    if (dh < 0) {
+        dy = dy + dh;
+        dh = -dh;
+    }
+
+    FloatRect srcM(sx, sy, sw, sh);
+    FloatRect dstM(dx, dy, dw, dh);
     QPainter* painter(ctxt->platformContext());
-    painter->drawPixmap(dst, m_pixmap, src);
+
+    painter->drawPixmap(dstM, m_pixmap, srcM);
     ctxt->restore();
 }