Changeset 150862 in webkit

Timestamp:

May 28, 2013 8:14:10 PM (11 years ago)

Author:

dino@apple.com

Message:

Animations do not restart after exiting page cache
​https://bugs.webkit.org/show_bug.cgi?id=116900

Reviewed by Tim Horton.

Source/WebCore:

Animations are suspended as they enter the page cache, but
were not getting correctly resumed when exiting. The cause
was an error in r149576 which was checking a global flag for suspension
on the AnimationController and thus not trying to resume anything.

Test: animations/resume-after-page-cache.html

• page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::suspendAnimationsForDocument):
(WebCore::AnimationControllerPrivate::resumeAnimationsForDocument):

LayoutTests:

New test to make sure an animation will resume if it
enters and leaves the page cache.

• animations/resources/page-cache-helper.html: Added.
• animations/resume-after-page-cache-expected.txt: Added.
• animations/resume-after-page-cache.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/resources/page-cache-helper.html (added)
• LayoutTests/animations/resume-after-page-cache-expected.txt (added)
• LayoutTests/animations/resume-after-page-cache.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/animation/AnimationController.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-28  Dean Jackson  <dino@apple.com>
+
+        Animations do not restart after exiting page cache
+        https://bugs.webkit.org/show_bug.cgi?id=116900
+
+        Reviewed by Tim Horton.
+
+        New test to make sure an animation will resume if it
+        enters and leaves the page cache.
+
+        * animations/resources/page-cache-helper.html: Added.
+        * animations/resume-after-page-cache-expected.txt: Added.
+        * animations/resume-after-page-cache.html: Added.
+
 2013-05-28  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-28  Dean Jackson  <dino@apple.com>
+
+        Animations do not restart after exiting page cache
+        https://bugs.webkit.org/show_bug.cgi?id=116900
+
+        Reviewed by Tim Horton.
+
+        Animations are suspended as they enter the page cache, but
+        were not getting correctly resumed when exiting. The cause
+        was an error in r149576 which was checking a global flag for suspension
+        on the AnimationController and thus not trying to resume anything.
+
+        Test: animations/resume-after-page-cache.html
+
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::suspendAnimationsForDocument):
+        (WebCore::AnimationControllerPrivate::resumeAnimationsForDocument):
+
 2013-05-28  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/page/animation/AnimationController.cpp

@@ -293 +293 @@
 void AnimationControllerPrivate::suspendAnimationsForDocument(Document* document)
 {
-    if (isSuspended())
-        return;
-
     setBeginAnimationUpdateTime(cBeginAnimationUpdateTimeNotSet);
 
@@ -312 +309 @@
 void AnimationControllerPrivate::resumeAnimationsForDocument(Document* document)
 {
-    if (!isSuspended())
-        return;
-
     setBeginAnimationUpdateTime(cBeginAnimationUpdateTimeNotSet);