Changeset 214939 in webkit

Timestamp:

Apr 5, 2017 3:09:11 AM (7 years ago)

Author:

magomez@igalia.com

Message:

[GTK+] PNG animations that should run once are not played at all
​https://bugs.webkit.org/show_bug.cgi?id=170499

Reviewed by Carlos Garcia Campos.

The repetition count reported bu the PNGImageDecoder is wrong. It's returning m_playCount - 1, which
means 0 for the animations that need to be played once. Change it to return an appropriate value.

Covered by existent tests.

• platform/image-decoders/png/PNGImageDecoder.cpp:

(WebCore::PNGImageDecoder::repetitionCount):

• platform/image-decoders/png/PNGImageDecoder.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/png/PNGImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/png/PNGImageDecoder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-05  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK+] PNG animations that should run once are not played at all
+        https://bugs.webkit.org/show_bug.cgi?id=170499
+
+        Reviewed by Carlos Garcia Campos.
+
+        The repetition count reported bu the PNGImageDecoder is wrong. It's returning m_playCount - 1, which
+        means 0 for the animations that need to be played once. Change it to return an appropriate value.
+
+        Covered by existent tests.
+
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::PNGImageDecoder::repetitionCount):
+        * platform/image-decoders/png/PNGImageDecoder.h:
+
 2017-04-05  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp

@@ -228 +228 @@
 }
 
+#if ENABLE(APNG)
+RepetitionCount PNGImageDecoder::repetitionCount() const
+{
+    // APNG format uses 0 to indicate that an animation must play indefinitely. But
+    // the RepetitionCount enumeration uses RepetitionCountInfinite, so we need to adapt this.
+    if (!m_playCount)
+        return RepetitionCountInfinite;
+
+    return m_playCount;
+}
+#endif
+
 bool PNGImageDecoder::isSizeAvailable()
 {

trunk/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.h

@@ -45 +45 @@
 #if ENABLE(APNG)
         size_t frameCount() const override { return m_frameCount; }
-        RepetitionCount repetitionCount() const override { return m_playCount-1; }
+        RepetitionCount repetitionCount() const override;
 #endif
         bool isSizeAvailable() override;