Changeset 86026 in webkit

Timestamp:

May 8, 2011 5:18:53 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-08 Jarkko Sakkinen <​jarkko.j.sakkinen@gmail.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] GraphicsContext3D::getImageData() does not retrieve image data correctly
​https://bugs.webkit.org/show_bug.cgi?id=58556

Tests: fast/canvas/webgl/gl-teximage.html

• platform/graphics/qt/GraphicsContext3DQt.cpp: (WebCore::GraphicsContext3D::getImageData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-08  Jarkko Sakkinen  <jarkko.j.sakkinen@gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] GraphicsContext3D::getImageData() does not retrieve image data correctly
+        https://bugs.webkit.org/show_bug.cgi?id=58556
+
+        Tests: fast/canvas/webgl/gl-teximage.html
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::getImageData):
+
 2011-05-07  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -31 +31 @@
 #include "NotImplemented.h"
 #include "QWebPageClient.h"
+#include "SharedBuffer.h"
 #include "qwebpage.h"
 #include <QAbstractScrollArea>
@@ -1740 +1741 @@
     if (!image)
         return false;
-    QPixmap* nativePixmap = image->nativeImageForCurrentFrame();
-    if (!nativePixmap)
-        return false;
-
+    QImage nativeImage;
+    // Is image already loaded? If not, load it.
+    if (image->data())
+        nativeImage = QImage::fromData(reinterpret_cast<const uchar*>(image->data()->data()), image->data()->size()).convertToFormat(QImage::Format_ARGB32);
+    else {
+        QPixmap* nativePixmap = image->nativeImageForCurrentFrame();
+        nativeImage = nativePixmap->toImage().convertToFormat(QImage::Format_ARGB32);
+    }
     AlphaOp neededAlphaOp = AlphaDoNothing;
-    if (!premultiplyAlpha)
-        // FIXME: must fetch the image data before the premultiplication step
-        neededAlphaOp = AlphaDoUnmultiply;
-    QImage nativeImage = nativePixmap->toImage().convertToFormat(QImage::Format_ARGB32);
+    if (premultiplyAlpha)
+        neededAlphaOp = AlphaDoPremultiply;
     outputVector.resize(nativeImage.byteCount());
-    return packPixels(nativeImage.rgbSwapped().bits(), SourceFormatRGBA8, image->width(), image->height(), 0,
-                      format, type, neededAlphaOp, outputVector.data());
+    return packPixels(nativeImage.bits(), SourceFormatBGRA8, image->width(), image->height(), 0, format, type, neededAlphaOp, outputVector.data());
 }