Changeset 61534 in webkit

Timestamp:

Jun 21, 2010 1:30:42 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-21 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Decode images directly to QPixmap
​https://bugs.webkit.org/show_bug.cgi?id=40797

Decode images to QPixmap directly instead of QImage when possible.
RGBA32Buffer transforms the pixmap back to image if
necessary.

This improve the performance with certain graphic system, and
can reduce memory usage.

• platform/graphics/qt/ImageDecoderQt.cpp: (WebCore::ImageDecoderQt::setData): (WebCore::ImageDecoderQt::internalHandleCurrentImage):
• platform/image-decoders/ImageDecoder.h: (WebCore::RGBA32Buffer::getAddr):
• platform/image-decoders/qt/RGBA32BufferQt.cpp: (WebCore::RGBA32Buffer::clear): (WebCore::RGBA32Buffer::zeroFill): (WebCore::RGBA32Buffer::copyBitmapData): (WebCore::RGBA32Buffer::setSize): (WebCore::RGBA32Buffer::asNewNativeImage): (WebCore::RGBA32Buffer::setPixmap):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageDecoderQt.cpp (modified) (3 diffs)
• platform/image-decoders/ImageDecoder.h (modified) (4 diffs)
• platform/image-decoders/qt/RGBA32BufferQt.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-21  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Decode images directly to QPixmap
+        https://bugs.webkit.org/show_bug.cgi?id=40797
+
+        Decode images to QPixmap directly instead of QImage when possible.
+        RGBA32Buffer transforms the pixmap back to image if
+        necessary.
+
+        This improve the performance with certain graphic system, and
+        can reduce memory usage.
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::setData):
+        (WebCore::ImageDecoderQt::internalHandleCurrentImage):
+        * platform/image-decoders/ImageDecoder.h:
+        (WebCore::RGBA32Buffer::getAddr):
+        * platform/image-decoders/qt/RGBA32BufferQt.cpp:
+        (WebCore::RGBA32Buffer::clear):
+        (WebCore::RGBA32Buffer::zeroFill):
+        (WebCore::RGBA32Buffer::copyBitmapData):
+        (WebCore::RGBA32Buffer::setSize):
+        (WebCore::RGBA32Buffer::asNewNativeImage):
+        (WebCore::RGBA32Buffer::setPixmap):
+
 2010-06-20  Dumitru Daniliuc  <dumi@chromium.org>
 

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

@@ -79 +79 @@
     m_reader.set(new QImageReader(m_buffer.get(), m_format));
 
-    // This will force the JPEG decoder to use JDCT_IFAST
-    m_reader->setQuality(49);
-
     // QImageReader only allows retrieving the format before reading the image
     m_format = m_reader->format();
@@ -189 +186 @@
 bool ImageDecoderQt::internalHandleCurrentImage(size_t frameIndex)
 {
-    // Now get the QImage from Qt and place it in the RGBA32Buffer
-    QImage img;
-    if (!m_reader->read(&img)) {
+    QPixmap pixmap;
+    bool pixmapLoaded;
+    const int imageCount = m_reader->imageCount();
+    if (imageCount == 0 || imageCount == 1)
+        pixmapLoaded = pixmap.loadFromData((const uchar*)(m_data->data()), m_data->size(), m_format);
+    else {
+        QImage img;
+        const bool imageLoaded = m_reader->read(&img);
+        if (imageLoaded) {
+            pixmap = QPixmap::fromImage(img);
+            pixmapLoaded = true;
+        }
+    }
+
+    if (!pixmapLoaded) {
         frameCount();
         repetitionCount();
@@ -203 +212 @@
     buffer->setStatus(RGBA32Buffer::FrameComplete);
     buffer->setDuration(m_reader->nextImageDelay());
-    buffer->setDecodedImage(img);
+    buffer->setPixmap(pixmap);
     return true;
 }

trunk/WebCore/platform/image-decoders/ImageDecoder.h

@@ -41 +41 @@
 #include "NativeImageSkia.h"
 #elif PLATFORM(QT)
+#include <QPixmap>
 #include <QImage>
 #endif
@@ -131 +132 @@
 
 #if PLATFORM(QT)
-        void setDecodedImage(const QImage& image);
-        QImage decodedImage() const { return m_image; }
+        void setPixmap(const QPixmap& pixmap);
 #endif
 
@@ -144 +144 @@
             return m_bitmap.getAddr32(x, y);
 #elif PLATFORM(QT)
+            m_image = m_pixmap.toImage();
+            m_pixmap = QPixmap();
             return reinterpret_cast<QRgb*>(m_image.scanLine(y)) + x;
 #else
@@ -169 +171 @@
         NativeImageSkia m_bitmap;
 #elif PLATFORM(QT)
+        mutable QPixmap m_pixmap;
         mutable QImage m_image;
         bool m_hasAlpha;

trunk/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp

@@ -58 +58 @@
 void RGBA32Buffer::clear()
 {
+    m_pixmap = QPixmap();
     m_image = QImage();
     m_status = FrameEmpty;
@@ -68 +69 @@
 void RGBA32Buffer::zeroFill()
 {
-    m_image.fill(0);
+    if (m_pixmap.isNull() && !m_image.isNull()) {
+        m_pixmap = QPixmap::fromImage(m_image);
+        m_image = QImage();
+    }
+    m_pixmap.fill(QColor(0, 0, 0, 0));
 }
 
@@ -77 +82 @@
 
     m_image = other.m_image;
+    m_pixmap = other.m_pixmap;
     m_size = other.m_size;
     m_hasAlpha = other.m_hasAlpha;
@@ -88 +94 @@
 
     m_size = IntSize(newWidth, newHeight);
-    m_image = QImage(newWidth, newHeight, QImage::Format_ARGB32_Premultiplied);
-    if (m_image.isNull())
+    m_image = QImage();
+    m_pixmap = QPixmap(newWidth, newHeight);
+    if (m_pixmap.isNull())
         return false;
 
@@ -100 +107 @@
 QPixmap* RGBA32Buffer::asNewNativeImage() const
 {
-    QPixmap pix = QPixmap::fromImage(m_image);
-    m_image = QImage();
-
-    return new QPixmap(pix);
+    if (m_pixmap.isNull() && !m_image.isNull()) {
+        m_pixmap = QPixmap::fromImage(m_image);
+        m_image = QImage();
+    }
+    return new QPixmap(m_pixmap);
 }
 
@@ -122 +130 @@
 
 // The image must not have format 8888 pre multiplied...
-void RGBA32Buffer::setDecodedImage(const QImage& image)
+void RGBA32Buffer::setPixmap(const QPixmap& pixmap)
 {
-    m_image = image;
-    m_size = image.size();
-    m_hasAlpha = image.hasAlphaChannel();
+    m_pixmap = pixmap;
+    m_image = QImage();
+    m_size = pixmap.size();
+    m_hasAlpha = pixmap.hasAlphaChannel();
 }