Changeset 62782 in webkit

Timestamp:

Jul 8, 2010 5:38:12 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-08 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Canvas putImageData() resets painter state
​https://bugs.webkit.org/show_bug.cgi?id=41827

Added a test to verify that the painting state remains intact after calling putImageData().

• fast/canvas/canvas-state-intact-after-putImageData-expected.txt: Added.
• fast/canvas/canvas-state-intact-after-putImageData.html: Added.
• fast/canvas/script-tests/canvas-state-intact-after-putImageData.js: Added.

2010-07-08 Andreas Kling <​andreas.kling@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Canvas putImageData() resets painter state
​https://bugs.webkit.org/show_bug.cgi?id=41827

Use drawImage() to copy pixels in putImageData() instead of QPixmap::operator=

Test: fast/canvas/canvas-state-intact-after-putImageData.html

• platform/graphics/qt/ImageBufferQt.cpp: (WebCore::putImageData):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-state-intact-after-putImageData-expected.txt (added)
• LayoutTests/fast/canvas/canvas-state-intact-after-putImageData.html (added)
• LayoutTests/fast/canvas/script-tests/canvas-state-intact-after-putImageData.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/qt/ImageBufferQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-08  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Canvas putImageData() resets painter state
+        https://bugs.webkit.org/show_bug.cgi?id=41827
+
+        Added a test to verify that the painting state remains intact after calling putImageData().
+
+        * fast/canvas/canvas-state-intact-after-putImageData-expected.txt: Added.
+        * fast/canvas/canvas-state-intact-after-putImageData.html: Added.
+        * fast/canvas/script-tests/canvas-state-intact-after-putImageData.js: Added.
+
 2010-07-08  Justin Schuh  <jschuh@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-08  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Canvas putImageData() resets painter state
+        https://bugs.webkit.org/show_bug.cgi?id=41827
+
+        Use drawImage() to copy pixels in putImageData() instead of QPixmap::operator=
+
+        Test: fast/canvas/canvas-state-intact-after-putImageData.html
+
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::putImageData):
+
 2010-07-08  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -235 +235 @@
     unsigned srcBytesPerRow = 4 * source->width();
 
-    bool isPainting = data.m_painter->isActive();
-    if (isPainting)
-        data.m_painter->end();
-
-    QImage image = data.m_pixmap.toImage();
-    if (multiplied == Unmultiplied)
-        image = image.convertToFormat(QImage::Format_ARGB32);
-    else
-        image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
+    QRect destRect(destx, desty, endx - destx, endy - desty);
+
+    QImage::Format format = multiplied == Unmultiplied ? QImage::Format_ARGB32 : QImage::Format_ARGB32_Premultiplied;
+    QImage image(destRect.size(), format);
 
     unsigned char* srcRows = source->data()->data()->data() + originy * srcBytesPerRow + originx * 4;
     for (int y = 0; y < numRows; ++y) {
-        quint32* scanLine = reinterpret_cast<quint32*>(image.scanLine(y + desty));
+        quint32* scanLine = reinterpret_cast<quint32*>(image.scanLine(y));
         for (int x = 0; x < numColumns; x++) {
             // ImageData stores the pixels in RGBA while QImage is ARGB
             quint32 pixel = reinterpret_cast<quint32*>(srcRows + 4 * x)[0];
             pixel = ((pixel << 16) & 0xff0000) | ((pixel >> 16) & 0xff) | (pixel & 0xff00ff00);
-            scanLine[x + destx] = pixel;
+            scanLine[x] = pixel;
         }
 
@@ -258 +253 @@
     }
 
-    data.m_pixmap = QPixmap::fromImage(image);
-
-    if (isPainting)
+    bool isPainting = data.m_painter->isActive();
+    if (!isPainting)
         data.m_painter->begin(&data.m_pixmap);
+    else {
+        data.m_painter->save();
+
+        // putImageData() should be unaffected by painter state
+        data.m_painter->resetTransform();
+        data.m_painter->setOpacity(1.0);
+        data.m_painter->setClipping(false);
+    }
+
+    data.m_painter->setCompositionMode(QPainter::CompositionMode_Source);
+    data.m_painter->drawImage(destRect, image);
+
+    if (!isPainting)
+        data.m_painter->end();
+    else
+        data.m_painter->restore();
 }