Changeset 73295 in webkit

Timestamp:

Dec 3, 2010 1:41:00 PM (13 years ago)

Author:

mrowe@apple.com

Message:

2010-12-03 Mark Rowe <​mrowe@apple.com>

Reviewed by Eric Seidel.

Animated GIF animates much more slowly in Safari than Firefox
<rdar://problem/7689300> / <​http://webkit.org/b/26455>

Adopt Firefox's behavior for frame duration clamping. Images that specify a frame duration
of <= 10ms are treated as having a frame duration of 100ms, while all other images use the
frame duration that they specify.

ImageIO currently implements its own clamping of frame durations (<rdar://problem/7689297>)
which will result in this change having no observable effect on platforms where it is used
until an updated version of ImageIO becomes available.

• platform/graphics/ImageSource.cpp: (WebCore::ImageSource::frameDurationAtIndex): Update the formatting of the comment and style of the code to match that in ImageSourceCG.
• platform/graphics/cg/ImageSourceCG.cpp: (WebCore::ImageSource::frameDurationAtIndex):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageSource.cpp (modified) (1 diff)
• platform/graphics/cg/ImageSourceCG.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-03  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Eric Seidel.
+
+        Animated GIF animates much more slowly in Safari than Firefox
+        <rdar://problem/7689300> / <http://webkit.org/b/26455>
+
+        Adopt Firefox's behavior for frame duration clamping. Images that specify a frame duration
+        of <= 10ms are treated as having a frame duration of 100ms, while all other images use the
+        frame duration that they specify.
+
+        ImageIO currently implements its own clamping of frame durations (<rdar://problem/7689297>)
+        which will result in this change having no observable effect on platforms where it is used
+        until an updated version of ImageIO becomes available.
+
+        * platform/graphics/ImageSource.cpp:
+        (WebCore::ImageSource::frameDurationAtIndex): Update the formatting of the comment and style
+        of the code to match that in ImageSourceCG.
+        * platform/graphics/cg/ImageSourceCG.cpp:
+        (WebCore::ImageSource::frameDurationAtIndex):
+
 2010-12-03  Chris Rogers  <crogers@google.com>
 

trunk/WebCore/platform/graphics/ImageSource.cpp

@@ -154 +154 @@
         return 0;
 
-    // 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.
+    // 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 <rdar://problem/7689300> and <http://webkit.org/b/36082>
+    // for more information.
     const float duration = buffer->duration() / 1000.0f;
-    return (duration < 0.051f) ? 0.100f : duration;
+    if (duration < 0.011f)
+        return 0.100f;
+    return duration;
 }
 

trunk/WebCore/platform/graphics/cg/ImageSourceCG.cpp

@@ -309 +309 @@
 
     // 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.
-    if (duration < 0.051f)
+    // We follow Firefox's behavior and use a duration of 100 ms for any frames that specify
+    // a duration of <= 10 ms. See <rdar://problem/7689300> and <http://webkit.org/b/36082>
+    // for more information.
+    if (duration < 0.011f)
         return 0.100f;
     return duration;