Changeset 117216 in webkit

Timestamp:

May 15, 2012 9:49:17 PM (12 years ago)

Author:

igor.o@sisa.samsung.com

Message:

regression(111639): Issue with simultaneous CSS animations
​https://bugs.webkit.org/show_bug.cgi?id=85929

Source/WebCore:

Currently, previousTimeToNextService is just saving the previous CompositeAnimation::timeToNextService
for AnimationControllerPrivate::updateAnimationTimerForRenderer, however CompositeAnimation::timeToNextService
is also called and used by updateAnimationTimer. Make sure we save the existing timeToNextService from
both places, updateAnimationTimerForRenderer and updateAnimationTimer.

Reviewed by Dean Jackson.

Test: animations/fill-mode-forwards.html

• page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::AnimationControllerPrivate):
(WebCore::AnimationControllerPrivate::updateAnimationTimerForRenderer):
(WebCore::AnimationControllerPrivate::updateAnimationTimer):

• page/animation/AnimationControllerPrivate.h:

(AnimationControllerPrivate):

LayoutTests:

Reviewed by Dean Jackson.

• animations/fill-mode-forwards-expected.txt: Added.
• animations/fill-mode-forwards.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/fill-mode-forwards-expected.txt (added)
• LayoutTests/animations/fill-mode-forwards.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/animation/AnimationController.cpp (modified) (6 diffs)
• Source/WebCore/page/animation/AnimationControllerPrivate.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-15  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        regression(111639): Issue with simultaneous CSS animations
+        https://bugs.webkit.org/show_bug.cgi?id=85929
+
+        Reviewed by Dean Jackson.
+
+        * animations/fill-mode-forwards-expected.txt: Added.
+        * animations/fill-mode-forwards.html: Added.
+
 2012-05-15  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        regression(111639): Issue with simultaneous CSS animations
+        https://bugs.webkit.org/show_bug.cgi?id=85929
+
+        Currently, previousTimeToNextService is just saving the previous CompositeAnimation::timeToNextService
+        for AnimationControllerPrivate::updateAnimationTimerForRenderer, however CompositeAnimation::timeToNextService
+        is also called and used by updateAnimationTimer. Make sure we save the existing timeToNextService from
+        both places, updateAnimationTimerForRenderer and updateAnimationTimer.
+
+        Reviewed by Dean Jackson.
+
+        Test: animations/fill-mode-forwards.html
+
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::AnimationControllerPrivate):
+        (WebCore::AnimationControllerPrivate::updateAnimationTimerForRenderer):
+        (WebCore::AnimationControllerPrivate::updateAnimationTimer):
+        * page/animation/AnimationControllerPrivate.h:
+        (AnimationControllerPrivate):
+
 2012-05-15  Tien-Ren Chen  <trchen@chromium.org>
 

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

@@ -58 +58 @@
     , m_animationsWaitingForStartTimeResponse()
     , m_waitingForAsyncStartNotification(false)
+    , m_previousTimeToNextService(0)
 {
 }
@@ -119 +120 @@
 void AnimationControllerPrivate::updateAnimationTimerForRenderer(RenderObject* renderer)
 {
-    static double previousTimeToNextService = 0;
     double timeToNextService = 0;
 
@@ -127 +127 @@
 
     if (m_animationTimer.isActive()) {
-        if (previousTimeToNextService < timeToNextService)
+        if (m_previousTimeToNextService < timeToNextService)
             return;
 
@@ -133 +133 @@
     }
 
-    previousTimeToNextService = timeToNextService;
+    m_previousTimeToNextService = timeToNextService;
     m_animationTimer.startOneShot(timeToNextService);
 }
@@ -145 +145 @@
         if (!m_animationTimer.isActive() || m_animationTimer.repeatInterval() == 0)
             m_animationTimer.startRepeating(cAnimationTimerDelay);
+
+        m_previousTimeToNextService = timeToNextService;
         return;
     }
@@ -158 +160 @@
     if (m_animationTimer.isActive())
         m_animationTimer.stop();
+    m_previousTimeToNextService = timeToNextService;
     m_animationTimer.startOneShot(timeToNextService);
 }

trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h

@@ -143 +143 @@
     WaitingAnimationsSet m_animationsWaitingForStartTimeResponse;
     bool m_waitingForAsyncStartNotification;
+    double m_previousTimeToNextService;
 };