[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[zecke at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 56bdc38906c428ccb041025582c052806b4dc4a9
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 10:48:14 2009 +0000

    [Qt] QtWebKit should use QImageReader::setQuality(49)
    
    https://bugs.webkit.org/show_bug.cgi?id=30740
    
    Using QImageReader::setQuality(49) will influence the JPEG
    decoder of Qt to use the JDCT_IFAST routines for decompressing. This
    is showing a 5% improvement in a reduction that decodes all images
    used during the page loading test. The libjpeg documentation mentions
    that the IFAST routine is not as accurate as other routines but in
    our tests we couldn't see a difference.
    
    * platform/graphics/qt/ImageDecoderQt.cpp:
    (WebCore::ImageDecoderQt::setData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8ffcdae..6291d75 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-14  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Rubber-stamped by Simon Hausmann.
+
+        [Qt] QtWebKit should use QImageReader::setQuality(49)
+        https://bugs.webkit.org/show_bug.cgi?id=30740
+
+        Using QImageReader::setQuality(49) will influence the JPEG
+        decoder of Qt to use the JDCT_IFAST routines for decompressing. This
+        is showing a 5% improvement in a reduction that decodes all images
+        used during the page loading test. The libjpeg documentation mentions
+        that the IFAST routine is not as accurate as other routines but in
+        our tests we couldn't see a difference.
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::setData):
+
 2009-11-11  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index 9746265..5fa76ca 100644
--- a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -82,6 +82,9 @@ void ImageDecoderQt::setData(SharedBuffer* data, bool allDataReceived)
     m_buffer->open(QBuffer::ReadOnly);
     m_reader = new QImageReader(m_buffer, 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();
 }

-- 
WebKit Debian packaging