Changeset 71001 in webkit

Timestamp:

Oct 31, 2010 7:04:27 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-31 Peter Kasting <​pkasting@google.com>

Reviewed by Adam Barth.

Treat GIFs with no loop count as "loop once".
​https://bugs.webkit.org/show_bug.cgi?id=47302

• fast/images/gif-loop-count-expected.checksum: Added.
• fast/images/gif-loop-count-expected.png: Added.
• fast/images/gif-loop-count-expected.txt: Added.
• fast/images/gif-loop-count.html: Added.
• fast/images/resources/gif-loop-count.gif: Added.
• fast/images/resources/gif-loop-count.png: Added.

2010-10-31 Peter Kasting <​pkasting@google.com>

Reviewed by Adam Barth.

Treat GIFs with no loop count as "loop once".
​https://bugs.webkit.org/show_bug.cgi?id=47302

Test: fast/images/gif-loop-count.html

• platform/image-decoders/gif/GIFImageDecoder.cpp: (WebCore::GIFImageDecoder::repetitionCount): (WebCore::GIFImageDecoder::gifComplete):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/gif-loop-count-expected.checksum (added)
• LayoutTests/fast/images/gif-loop-count-expected.png (added)
• LayoutTests/fast/images/gif-loop-count-expected.txt (added)
• LayoutTests/fast/images/gif-loop-count.html (added)
• LayoutTests/fast/images/resources/gif-loop-count.gif (added)
• LayoutTests/fast/images/resources/gif-loop-count.png (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-31  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Adam Barth.
+
+        Treat GIFs with no loop count as "loop once".
+        https://bugs.webkit.org/show_bug.cgi?id=47302
+
+        * fast/images/gif-loop-count-expected.checksum: Added.
+        * fast/images/gif-loop-count-expected.png: Added.
+        * fast/images/gif-loop-count-expected.txt: Added.
+        * fast/images/gif-loop-count.html: Added.
+        * fast/images/resources/gif-loop-count.gif: Added.
+        * fast/images/resources/gif-loop-count.png: Added.
+
 2010-10-31  James Simonsen  <simonjam@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-31  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Adam Barth.
+
+        Treat GIFs with no loop count as "loop once".
+        https://bugs.webkit.org/show_bug.cgi?id=47302
+
+        Test: fast/images/gif-loop-count.html
+
+        * platform/image-decoders/gif/GIFImageDecoder.cpp:
+        (WebCore::GIFImageDecoder::repetitionCount):
+        (WebCore::GIFImageDecoder::gifComplete):
+
 2010-10-31  No'am Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp

@@ -97 +97 @@
     // in the wild declare it near the beginning of the file, so it usually is
     // set by the time we've decoded the size, but (depending on the GIF and the
-    // packets sent back by the webserver) not always.  Our caller is
-    // responsible for waiting until image decoding has finished to ask this if
-    // it needs an authoritative answer.  In the meantime, we should default to
-    // "loop once".
-    if (m_reader) {
-        // Added wrinkle: ImageSource::clear() may destroy the reader, making
-        // the result from the reader _less_ authoritative on future calls.  To
-        // detect this, the reader returns cLoopCountNotSeen (-2) instead of
-        // cAnimationLoopOnce (0) when its current incarnation hasn't actually
-        // seen a loop count yet; in this case we return our previously-cached
-        // value.
-        const int repetitionCount = m_reader->loop_count;
-        if (repetitionCount != cLoopCountNotSeen)
-            m_repetitionCount = repetitionCount;
-    }
+    // packets sent back by the webserver) not always.  If the reader hasn't
+    // seen a loop count yet, it will return cLoopCountNotSeen, in which case we
+    // should default to looping once (the initial value for
+    // |m_repetitionCount|).
+    //
+    // There are two additional wrinkles here.  First, ImageSource::clear() may
+    // destroy the reader, making the result from the reader _less_
+    // authoritative on future calls if the recreated reader hasn't seen the
+    // loop count.  We don't need to special-case this because in this case the
+    // new reader will once again return cLoopCountNotSeen, and we won't
+    // overwrite the cached correct value.
+    //
+    // Second, a GIF might never set a loop count at all, in which case we
+    // should continue to treat it as a "loop once" animation.  We don't need
+    // special code here either, because in this case we'll never change
+    // |m_repetitionCount| from its default value.
+    if (m_reader && (m_reader->loop_count != cLoopCountNotSeen))
+        m_repetitionCount = m_reader->loop_count;
     return m_repetitionCount;
 }
@@ -296 +299 @@
 void GIFImageDecoder::gifComplete()
 {
-    if (m_reader)
-        m_repetitionCount = m_reader->loop_count;
+    // Cache the repetition count, which is now as authoritative as it's ever
+    // going to be.
+    repetitionCount();
+
     m_reader.clear();
 }