Changeset 55774 in webkit

Timestamp:

Mar 10, 2010 2:46:08 AM (14 years ago)

Author:

zecke@webkit.org

Message:

[Qt] Non animated gifs are animated in QtWebKit

​https://bugs.webkit.org/show_bug.cgi?id=35955

Properly map Qt animated and non-animated values to WebCore's
understanding of animated and non-animated images. Currently
we can not map anything to the cAnimationLoopNone value.

• manual-tests/qt/qt-anim.gif: Added.
• manual-tests/qt/qt-gif-test.html: Added.
• manual-tests/qt/qt-noanim.gif: Added.
• platform/graphics/qt/ImageDecoderQt.cpp:

(WebCore::ImageDecoderQt::repetitionCount):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/qt/qt-anim.gif (added)
• manual-tests/qt/qt-gif-test.html (added)
• manual-tests/qt/qt-noanim.gif (added)
• platform/graphics/qt/ImageDecoderQt.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-10  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Non animated gifs are animated in QtWebKit
+        https://bugs.webkit.org/show_bug.cgi?id=35955
+
+        Properly map Qt animated and non-animated values to WebCore's
+        understanding of animated and non-animated images. Currently
+        we can not map anything to the cAnimationLoopNone value.
+
+        * manual-tests/qt/qt-anim.gif: Added.
+        * manual-tests/qt/qt-gif-test.html: Added.
+        * manual-tests/qt/qt-noanim.gif: Added.
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::repetitionCount):
+
 2010-03-07  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/platform/graphics/qt/ImageDecoderQt.cpp

@@ -116 +116 @@
 int ImageDecoderQt::repetitionCount() const
 {
-    if (m_reader && m_reader->supportsAnimation())
-        m_repetitionCount = qMax(0, m_reader->loopCount());
+    if (m_reader && m_reader->supportsAnimation()) {
+        m_repetitionCount = m_reader->loopCount();
+
+        // Qt and WebCore have a incompatible understanding of
+        // the loop count and we can not completely map everything.
+        //  Qt   |   WebCore          | description
+        //  -1   |     0              | infinite animation
+        //   0   | cAnimationLoopOnce | show every frame once
+        //   n   |     n              | no idea if that is supported
+        //  n/a  | cAnimationNone     | show only the first frame
+        if (m_repetitionCount == -1)
+            m_repetitionCount = 0;
+        else if (m_repetitionCount == 0)
+            m_repetitionCount = cAnimationLoopOnce;
+    }
 
     return m_repetitionCount;