[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 14eab0b338451061da6aa5c9da3caffa4983cfcd
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 13:46:24 2009 +0000

    [Qt] QImageReader does not support progressive reading
    
    https://bugs.webkit.org/show_bug.cgi?id=27538
    
    Change the ImageDecoderQt::setData to store the encoded
    data in ImageDecoder.
    
    Only call ReadContext when the whole Resource has been
    loaded to avoid needless calls to reset and the
    ReadContext as progressive loading is not supported.
    
    * platform/graphics/qt/ImageDecoderQt.cpp:
    (WebCore::ImageDecoderQt::setData):
    * platform/graphics/qt/ImageDecoderQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49180 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad737ca..c71f33c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,24 @@
 
         Reviewed by Simon Hausmann.
 
+        [Qt] QImageReader does not support progressive reading
+        https://bugs.webkit.org/show_bug.cgi?id=27538
+
+        Change the ImageDecoderQt::setData to store the encoded
+        data in ImageDecoder.
+
+        Only call ReadContext when the whole Resource has been
+        loaded to avoid needless calls to reset and the
+        ReadContext as progressive loading is not supported.
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::setData):
+        * platform/graphics/qt/ImageDecoderQt.h:
+
+2009-10-04  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Simon Hausmann.
+
         [Qt] Remove dead code from ImageDecoderQt
         https://bugs.webkit.org/show_bug.cgi?id=27538
 
diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index 1bd81bb..9e33593 100644
--- a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -201,18 +201,18 @@ bool ImageDecoderQt::hasFirstImageHeader() const
     return  !m_imageList.empty() && m_imageList[0].m_imageState >= ImageHeaderValid;
 }
 
-void ImageDecoderQt::reset()
-{
-    m_hasAlphaChannel = false;
-    m_failed = false;
-    m_imageList.clear();
-    m_pixmapCache.clear();
-    m_loopCount = cAnimationNone;
-}
-
 void ImageDecoderQt::setData(SharedBuffer* data, bool allDataReceived)
 {
-    reset();
+    if (m_failed)
+        return;
+
+    // Cache our own new data.
+    ImageDecoder::setData(data, allDataReceived);
+
+    // No progressive loading possible
+    if (!allDataReceived)
+        return;
+
     ReadContext readContext(data, ReadContext::LoadComplete, m_imageList);
 
     const  ReadContext::ReadResult readResult =  readContext.read(allDataReceived);
diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.h b/WebCore/platform/graphics/qt/ImageDecoderQt.h
index 59751c5..bdd09eb 100644
--- a/WebCore/platform/graphics/qt/ImageDecoderQt.h
+++ b/WebCore/platform/graphics/qt/ImageDecoderQt.h
@@ -60,7 +60,6 @@ private:
     ImageDecoderQt &operator=(const ImageDecoderQt&);
 
     class ReadContext;
-    void reset();
     bool hasFirstImageHeader() const;
 
     enum ImageState {

-- 
WebKit Debian packaging