Changeset 122269 in webkit

Timestamp:

Jul 10, 2012 3:11:54 PM (12 years ago)

Author:

kseo@webkit.org

Message:

Fix a potential bug of BitmapImage::frameCount().
​https://bugs.webkit.org/show_bug.cgi?id=90756

Patch by Huang Dongsung <​luxtella@company100.net> on 2012-07-10
Reviewed by Simon Fraser.

If an ImageDecoder is not yet initialized, m_source.frameCount() returns 0. This
does not mean that the frame count is actually 0. So we must set
m_haveFrameCount to true only when m_frameCount is not 0.

The current code is okay because BitmapImage::frameCount() is never called
before the decoder is initialized. However, this no longer holds true once we
introduce parallel image decoders.

No new tests, no behavior change.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::frameCount):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-10  Huang Dongsung  <luxtella@company100.net>
+
+        Fix a potential bug of BitmapImage::frameCount().
+        https://bugs.webkit.org/show_bug.cgi?id=90756
+
+        Reviewed by Simon Fraser.
+
+        If an ImageDecoder is not yet initialized, m_source.frameCount() returns 0. This
+        does not mean that the frame count is actually 0. So we must set
+        m_haveFrameCount to true only when m_frameCount is not 0.
+
+        The current code is okay because BitmapImage::frameCount() is never called
+        before the decoder is initialized. However, this no longer holds true once we
+        introduce parallel image decoders.
+
+        No new tests, no behavior change.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::frameCount):
+
 2012-07-10  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp

@@ -264 +264 @@
 {
     if (!m_haveFrameCount) {
-        m_haveFrameCount = true;
         m_frameCount = m_source.frameCount();
-        didDecodeProperties();
+        // If decoder is not initialized yet, m_source.frameCount() returns 0.
+        if (m_frameCount) {
+            didDecodeProperties();
+            m_haveFrameCount = true;
+        }
     }
     return m_frameCount;