Changeset 1380 for trunk/BAL/Graphics/WebCore/WK/BCBitmapImageWK.cpp

Timestamp:

02/18/10 13:55:47 (7 months ago)

Author:

gpenin

Message:

merge with webkit revision 54942

Files:

• trunk/BAL/Graphics/WebCore/WK/BCBitmapImageWK.cpp (modified) (2 diffs)

trunk/BAL/Graphics/WebCore/WK/BCBitmapImageWK.cpp

@@ -267 +267 @@
-        return;
-
+    // Don't advance the animation to an incomplete frame.
+    size_t nextFrame = (m_currentFrame + 1) % frameCount();
+    if (!m_allDataReceived && !frameIsCompleteAtIndex(nextFrame))
+        return;
+
+    // Don't advance past the last frame if we haven't decoded the whole image
+    // yet and our repetition count is potentially unset.  The repetition count
+    // in a GIF can potentially come after all the rest of the image data, so
+    // wait on it.
+    if (!m_allDataReceived && repetitionCount(false) == cAnimationLoopOnce && m_currentFrame >= (frameCount() - 1))
+        return;
+
-    // Determine time for next frame to start.  By ignoring paint and timer lag
-    // in this calculation, we make the animation appear to run at its desired
@@ -284 +296 @@
-            m_desiredFrameStartTime = time + currentDuration;
-    }
-
-    // Don't advance the animation to an incomplete frame.
-    size_t nextFrame = (m_currentFrame + 1) % frameCount();
-    if (!m_allDataReceived && !frameIsCompleteAtIndex(nextFrame))
-        return;
-
-    // Don't advance past the last frame if we haven't decoded the whole image
-    // yet and our repetition count is potentially unset.  The repetition count
-    // in a GIF can potentially come after all the rest of the image data, so
-    // wait on it.
-    if (!m_allDataReceived && repetitionCount(false) == cAnimationLoopOnce && m_currentFrame >= (frameCount() - 1))
-        return;
-
-    // The image may load more slowly than it's supposed to animate, so that by