Changeset 70758 in webkit

Timestamp:

Oct 28, 2010 1:21:48 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-28 Pascal Massimino <​pascal.massimino@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

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/webp/WEBPImageDecoder.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-28  Pascal Massimino  <pascal.massimino@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@apple.com>
 

trunk/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp

@@ -87 +87 @@
     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) {