[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e554c45b45cc2c4e1fda53944fcc7da9f711b7f9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 08:21:48 2010 +0000

    2010-10-28  Pascal Massimino  <pascal.massimino at gmail.com>
    
            Reviewed by Adam Barth.
    
            fix setSize() call flow: it was only called the first
            time (when onlySize is true)
            Bug URL: https://bugs.webkit.org/show_bug.cgi?id=48494
    
            Testing: difficult to exercise the bug, as it requires
            some manual flow (change tab, scroll,...)
    
            * platform/image-decoders/webp/WEBPImageDecoder.cpp:
            (WebCore::WEBPImageDecoder::decode):
               fix: call setSize() even when onlySize is false
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5cfe6e6..d464b9b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-28  Pascal Massimino  <pascal.massimino at gmail.com>
+
+        Reviewed by Adam Barth.
+
+        fix setSize() call flow: it was only called the first
+        time (when onlySize is true)
+        Bug URL: https://bugs.webkit.org/show_bug.cgi?id=48494
+
+        Testing: difficult to exercise the bug, as it requires
+        some manual flow (change tab, scroll,...)
+
+        * platform/image-decoders/webp/WEBPImageDecoder.cpp:
+        (WebCore::WEBPImageDecoder::decode):
+           fix: call setSize() even when onlySize is false
+
 2010-10-28  Andy Estes  <aestes at apple.com>
 
         Fix the Qt build after r70754.
diff --git a/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp b/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp
index 979b193..2275fc7 100644
--- a/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp
+++ b/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp
@@ -86,14 +86,15 @@ bool WEBPImageDecoder::decode(bool onlySize)
         return true;
     if (!WebPGetInfo(dataBytes, dataSize, &width, &height))
         return setFailed();
+    if (!ImageDecoder::isSizeAvailable() && !setSize(width, height))
+        return setFailed();
     if (onlySize)
-        return setSize(width, height) || setFailed();
+        return true;
 
     // FIXME: Add support for progressive decoding.
     if (!isAllDataReceived())
         return true;
-    if (m_frameBufferCache.isEmpty())
-        return true;
+    ASSERT(!m_frameBufferCache.isEmpty());
     RGBA32Buffer& buffer = m_frameBufferCache[0];
     if (buffer.status() == RGBA32Buffer::FrameEmpty) {
         ASSERT(width == size().width());

-- 
WebKit Debian packaging