Changeset 25295 in webkit

Timestamp:

Aug 29, 2007 10:34:01 AM (17 years ago)

Author:

bdash

Message:

2007-08-29 Peter Kasting <​zerodpx@gmail.com>

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15096 Move the GIF frame duration minimum check into the various ImageSource*.cpp backends and use the same values as ImageSourceCG.cpp.

• platform/graphics/cairo/ImageSourceCairo.cpp: (WebCore::ImageSource::frameDurationAtIndex):
• platform/graphics/qt/ImageSourceQt.cpp: (WebCore::ImageSource::frameDurationAtIndex):
• platform/image-decoders/gif/GIFImageReader.cpp: (GIFImageReader::read):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/ImageSourceCairo.cpp (modified) (1 diff)
• platform/graphics/qt/ImageSourceQt.cpp (modified) (1 diff)
• platform/image-decoders/gif/GIFImageReader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-29  Peter Kasting  <zerodpx@gmail.com>
+
+        Reviewed by Maciej.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=15096
+        Move the GIF frame duration minimum check into the various
+        ImageSource*.cpp backends and use the same values as
+        ImageSourceCG.cpp.
+
+        * platform/graphics/cairo/ImageSourceCairo.cpp:
+        (WebCore::ImageSource::frameDurationAtIndex):
+        * platform/graphics/qt/ImageSourceQt.cpp:
+        (WebCore::ImageSource::frameDurationAtIndex):
+        * platform/image-decoders/gif/GIFImageReader.cpp:
+        (GIFImageReader::read):
+
 2007-08-29  Peter Kasting  <zerodpx@gmail.com>
 

trunk/WebCore/platform/graphics/cairo/ImageSourceCairo.cpp

@@ -183 +183 @@
         return 0;
 
-    return buffer->duration() / 1000.0f;
+    // Many annoying ads specify a 0 duration to make an image flash as quickly
+    // as possible.  We follow WinIE's behavior and use a duration of 100 ms
+    // for any frames that specify a duration of <= 50 ms.  See
+    // <http://bugs.webkit.org/show_bug.cgi?id=14413> or Radar 4051389 for
+    // more.
+    const float duration = buffer->duration() / 1000.0f;
+    return (duration < 0.051f) ? 0.100f : duration;
 }
 

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

@@ -171 +171 @@
         return 0;
     
-    return m_decoder->duration(index) / 1000.0f;
+    // Many annoying ads specify a 0 duration to make an image flash as quickly
+    // as possible.  We follow WinIE's behavior and use a duration of 100 ms
+    // for any frames that specify a duration of <= 50 ms.  See
+    // <http://bugs.webkit.org/show_bug.cgi?id=14413> or Radar 4051389 for
+    // more.
+    const float duration = m_decoder->duration(index) / 1000.0f;
+    return (duration < 0.051f) ? 0.100f : duration;
 }
 

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

@@ -652 +652 @@
         if (frame_reader->disposal_method == 4)
           frame_reader->disposal_method = (gdispose)3;
-        unsigned short n = GETINT16(q + 1);
-        // Many annoying ads specify a 0 duration to make an image flash as quickly as possible.
-        // We follow Firefox's behavior and use a duration of 100 ms for any frames that specify
-        // a duration of <= 10 ms. See gfxImageFrame::GetTimeout in Gecko or Radar 4051389 for more.
-        frame_reader->delay_time = n <= 1 ? 100 : n * 10;
+        frame_reader->delay_time = GETINT16(q + 1) * 10;
       }
       GETN(1, gif_consume_block);