Changeset 239269 in webkit

Timestamp:

Dec 17, 2018 9:49:55 AM (5 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Ensure we don't update an animation's finished state twice when updating animations
​https://bugs.webkit.org/show_bug.cgi?id=192757

Reviewed by Dean Jackson.

When animations are udpated and DocumentTimeline::updateAnimationsAndSendEvents() is called, we used to update an animation's finished state
twice since we'd do it once when calling tick() and once again when calling resolve() in the ensuing style invalidation. We now keep track of
whether we've already updated an animation's finished state during animation update in the call to tick() and avoid updating in the immediate
next call to resolve(), unless any of the timing properties have changed in the meantime.

No new test since there is no user-observable change.

• animation/WebAnimation.cpp:

(WebCore::WebAnimation::timingDidChange):
(WebCore::WebAnimation::tick):
(WebCore::WebAnimation::resolve):

• animation/WebAnimation.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/WebAnimation.cpp (modified) (3 diffs)
• animation/WebAnimation.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-17  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Ensure we don't update an animation's finished state twice when updating animations
+        https://bugs.webkit.org/show_bug.cgi?id=192757
+
+        Reviewed by Dean Jackson.
+
+        When animations are udpated and DocumentTimeline::updateAnimationsAndSendEvents() is called, we used to update an animation's finished state
+        twice since we'd do it once when calling tick() and once again when calling resolve() in the ensuing style invalidation. We now keep track of
+        whether we've already updated an animation's finished state during animation update in the call to tick() and avoid updating in the immediate
+        next call to resolve(), unless any of the timing properties have changed in the meantime.
+
+        No new test since there is no user-observable change.
+
+        * animation/WebAnimation.cpp:
+        (WebCore::WebAnimation::timingDidChange):
+        (WebCore::WebAnimation::tick):
+        (WebCore::WebAnimation::resolve):
+        * animation/WebAnimation.h:
+
 2018-12-17  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/animation/WebAnimation.cpp

@@ -697 +697 @@
 void WebAnimation::timingDidChange(DidSeek didSeek, SynchronouslyNotify synchronouslyNotify)
 {
+    m_shouldSkipUpdatingFinishedStateWhenResolving = false;
     updateFinishedState(didSeek, synchronouslyNotify);
     if (m_timeline)
@@ -1108 +1109 @@
 {
     updateFinishedState(DidSeek::No, SynchronouslyNotify::Yes);
+    m_shouldSkipUpdatingFinishedStateWhenResolving = true;
 
     // Run pending tasks, if any.
@@ -1120 +1122 @@
 void WebAnimation::resolve(RenderStyle& targetStyle)
 {
-    updateFinishedState(DidSeek::No, SynchronouslyNotify::Yes);
+    if (!m_shouldSkipUpdatingFinishedStateWhenResolving)
+        updateFinishedState(DidSeek::No, SynchronouslyNotify::Yes);
+    m_shouldSkipUpdatingFinishedStateWhenResolving = false;
+
     if (m_effect)
         m_effect->apply(targetStyle);

trunk/Source/WebCore/animation/WebAnimation.h

@@ -175 +175 @@
     bool m_scheduledMicrotask;
     bool m_isRelevant;
+    bool m_shouldSkipUpdatingFinishedStateWhenResolving;
     UniqueRef<ReadyPromise> m_readyPromise;
     UniqueRef<FinishedPromise> m_finishedPromise;