Changeset 107575 in webkit

Timestamp:

Feb 13, 2012 8:39:34 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Use requestAnimationFrame callbacks to pump CSS animations
​https://bugs.webkit.org/show_bug.cgi?id=64591

Patch by Joel Webber <​jgw@google.com> on 2012-02-13
Reviewed by James Robinson.

No new tests needed (covered by tests in animations/*).

• page/FrameView.cpp:

(WebCore::FrameView::serviceScriptedAnimations):

• page/animation/AnimationController.cpp:

(WebCore::AnimationControllerPrivate::updateAnimations):
(WebCore::AnimationControllerPrivate::updateAnimationTimer):
(WebCore::AnimationControllerPrivate::fireEventsAndUpdateStyle):
(WebCore::AnimationControllerPrivate::animationFrameCallbackFired):
(WebCore::AnimationController::updateAnimations):
(WebCore::AnimationController::serviceAnimations):

• page/animation/AnimationController.h:
• page/animation/AnimationControllerPrivate.h:

Location:

trunk

Files:

• LayoutTests/compositing/repaint/become-overlay-composited-layer.html (modified) (1 diff)
• LayoutTests/platform/chromium-linux/compositing/repaint/become-overlay-composited-layer-expected.png (modified) (previous)
• LayoutTests/platform/chromium-linux/compositing/repaint/become-overlay-composited-layer-expected.txt (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Source/WebCore/page/animation/AnimationController.cpp (modified) (11 diffs)
• Source/WebCore/page/animation/AnimationController.h (modified) (1 diff)
• Source/WebCore/page/animation/AnimationControllerPrivate.h (modified) (3 diffs)

trunk/LayoutTests/compositing/repaint/become-overlay-composited-layer.html

@@ -52 +52 @@
         window.setTimeout(function() {
           document.getElementById("container").className = "";
-          if (window.layoutTestController)
-            layoutTestController.notifyDone();
+          window.setTimeout(function() {
+            if (window.layoutTestController)
+              layoutTestController.notifyDone();
+          }, 250);
         }, 250);
       }

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -997 +997 @@
 // SVG TESTS
 // -----------------------------------------------------------------
+
+// Need rebaselining after bug 64591
+BUGWK64591 : compositing/repaint/become-overlay-composited-layer.html = PASS FAIL
 
 BUGCR8763 MAC : svg/custom/use-on-g-containing-foreignObject-and-image.svg = IMAGE

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-13  Joel Webber  <jgw@google.com>
+
+        Use requestAnimationFrame callbacks to pump CSS animations
+        https://bugs.webkit.org/show_bug.cgi?id=64591
+
+        Reviewed by James Robinson.
+
+        No new tests needed (covered by tests in animations/*).
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::serviceScriptedAnimations):
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::updateAnimations):
+        (WebCore::AnimationControllerPrivate::updateAnimationTimer):
+        (WebCore::AnimationControllerPrivate::fireEventsAndUpdateStyle):
+        (WebCore::AnimationControllerPrivate::animationFrameCallbackFired):
+        (WebCore::AnimationController::updateAnimations):
+        (WebCore::AnimationController::serviceAnimations):
+        * page/animation/AnimationController.h:
+        * page/animation/AnimationControllerPrivate.h:
+
 2012-02-13  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2114 +2114 @@
 void FrameView::serviceScriptedAnimations(DOMTimeStamp time)
 {
+    Vector<AnimationController*> animations;
+    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext())
+        frame->animation()->serviceAnimations();
+
     Vector<RefPtr<Document> > documents;
-
     for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext())
         documents.append(frame->document());

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

@@ -36 +36 @@
 #include "EventNames.h"
 #include "Frame.h"
+#include "FrameView.h"
 #include "RenderView.h"
 #include "WebKitAnimationEvent.h"
@@ -45 +46 @@
 namespace WebCore {
 
-// FIXME: Why isn't this set to 60fps or something?
 static const double cAnimationTimerDelay = 0.025;
 static const double cBeginAnimationUpdateTimeNotSet = -1;
@@ -85 +85 @@
 }
 
-void AnimationControllerPrivate::updateAnimationTimer(bool callSetChanged/* = false*/)
-{
-    double needsService = -1;
+double AnimationControllerPrivate::updateAnimations(SetChanged callSetChanged/* = DoNotCallSetChanged*/)
+{
+    double timeToNextService = -1;
     bool calledSetChanged = false;
 
@@ -95 +95 @@
         if (!compAnim->suspended() && compAnim->hasAnimations()) {
             double t = compAnim->timeToNextService();
-            if (t != -1 && (t < needsService || needsService == -1))
-                needsService = t;
-            if (needsService == 0) {
-                if (callSetChanged) {
+            if (t != -1 && (t < timeToNextService || timeToNextService == -1))
+                timeToNextService = t;
+            if (!timeToNextService) {
+                if (callSetChanged == CallSetChanged) {
                     Node* node = it->first->node();
                     ASSERT(!node || (node->document() && !node->document()->inPageCache()));
@@ -109 +109 @@
         }
     }
-    
+
     if (calledSetChanged)
         m_frame->document()->updateStyleIfNeeded();
-    
+
+    return timeToNextService;
+}
+
+void AnimationControllerPrivate::updateAnimationTimer(SetChanged callSetChanged/* = DoNotCallSetChanged*/)
+{
+    double timeToNextService = updateAnimations(callSetChanged);
+
     // If we want service immediately, we start a repeating timer to reduce the overhead of starting
-    if (needsService == 0) {
+    if (!timeToNextService) {
         if (!m_animationTimer.isActive() || m_animationTimer.repeatInterval() == 0)
             m_animationTimer.startRepeating(cAnimationTimerDelay);
         return;
     }
-    
+
     // If we don't need service, we want to make sure the timer is no longer running
-    if (needsService < 0) {
+    if (timeToNextService < 0) {
         if (m_animationTimer.isActive())
             m_animationTimer.stop();
         return;
     }
-    
+
     // Otherwise, we want to start a one-shot timer so we get here again
     if (m_animationTimer.isActive())
         m_animationTimer.stop();
-    m_animationTimer.startOneShot(needsService);
+    m_animationTimer.startOneShot(timeToNextService);
 }
 
@@ -144 +151 @@
 
     bool updateStyle = !m_eventsToDispatch.isEmpty() || !m_nodeChangesToDispatch.isEmpty();
-    
+
     // fire all the events
     Vector<EventToDispatch> eventsToDispatch = m_eventsToDispatch;
@@ -155 +162 @@
             it->element->dispatchEvent(WebKitAnimationEvent::create(it->eventType, it->name, it->elapsedTime));
     }
-    
+
     // call setChanged on all the elements
     Vector<RefPtr<Node> >::const_iterator nodeChangesToDispatchEnd = m_nodeChangesToDispatch.end();
     for (Vector<RefPtr<Node> >::const_iterator it = m_nodeChangesToDispatch.begin(); it != nodeChangesToDispatchEnd; ++it)
         (*it)->setNeedsStyleRecalc(SyntheticStyleChange);
-    
+
     m_nodeChangesToDispatch.clear();
-    
+
     if (updateStyle && m_frame)
         m_frame->document()->updateStyleIfNeeded();
@@ -195 +202 @@
 }
 
+#if ENABLE(REQUEST_ANIMATION_FRAME)
+void AnimationControllerPrivate::animationFrameCallbackFired()
+{
+    double timeToNextService = updateAnimations(CallSetChanged);
+
+    if (timeToNextService >= 0)
+        m_frame->document()->view()->scheduleAnimation();
+}
+#endif
+
 void AnimationControllerPrivate::animationTimerFired(Timer<AnimationControllerPrivate>*)
 {
@@ -203 +220 @@
     // When the timer fires, all we do is call setChanged on all DOM nodes with running animations and then do an immediate
     // updateStyleIfNeeded.  It will then call back to us with new information.
-    updateAnimationTimer(true);
+    updateAnimationTimer(CallSetChanged);
 
     // Fire events right away, to avoid a flash of unanimated style after an animation completes, and before
@@ -500 +517 @@
     RefPtr<RenderStyle> blendedStyle = rendererAnimations->animate(renderer, oldStyle, newStyle);
 
-    if (renderer->parent() || newStyle->animations() || (oldStyle && oldStyle->animations()))
+    if (renderer->parent() || newStyle->animations() || (oldStyle && oldStyle->animations())) {
         m_data->updateAnimationTimer();
+#if ENABLE(REQUEST_ANIMATION_FRAME)
+        if (FrameView* view = renderer->document()->view())
+            view->scheduleAnimation();
+#endif
+    }
 
     if (blendedStyle != newStyle) {
@@ -558 +580 @@
 }
 
+#if ENABLE(REQUEST_ANIMATION_FRAME)
+void AnimationController::serviceAnimations()
+{
+    m_data->animationFrameCallbackFired();
+}
+#endif
+
 void AnimationController::suspendAnimationsForDocument(Document* document)
 {

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

@@ -67 +67 @@
     void suspendAnimations();
     void resumeAnimations();
+#if ENABLE(REQUEST_ANIMATION_FRAME)
+    void serviceAnimations();
+#endif
 
     void suspendAnimationsForDocument(Document*);

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

@@ -52 +52 @@
 class WebKitAnimationList;
 
+enum SetChanged {
+    DoNotCallSetChanged = 0,
+    CallSetChanged = 1
+};
+
 class AnimationControllerPrivate {
     WTF_MAKE_NONCOPYABLE(AnimationControllerPrivate); WTF_MAKE_FAST_ALLOCATED;
@@ -58 +63 @@
     ~AnimationControllerPrivate();
 
-    void updateAnimationTimer(bool callSetChanged = false);
+    // Returns the time until the next animation needs to be serviced, or -1 if there are none.
+    double updateAnimations(SetChanged callSetChanged = DoNotCallSetChanged);
+    void updateAnimationTimer(SetChanged callSetChanged = DoNotCallSetChanged);
 
     PassRefPtr<CompositeAnimation> accessCompositeAnimation(RenderObject*);
@@ -72 +79 @@
     void suspendAnimations();
     void resumeAnimations();
+#if ENABLE(REQUEST_ANIMATION_FRAME)
+    void animationFrameCallbackFired();
+#endif
 
     void suspendAnimationsForDocument(Document*);