Devtools Animations: Maintain playback rate on navigation

third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/inspector/InspectorAnimationAgent.h"
 
 #include "core/animation/Animation.h"
 #include "core/animation/AnimationEffect.h"
@@ skipping 16 matching lines @@
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorDOMAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InspectorStyleSheet.h"
 #include "platform/Decimal.h"
 #include "platform/animation/TimingFunction.h"
 #include "wtf/text/Base64.h"
 
 namespace AnimationAgentState {
 static const char animationAgentEnabled[] = "animationAgentEnabled";
+static const char animationAgentPlaybackRate[] = "animationAgentPlaybackRate";
 }
 
 namespace blink {
 
 InspectorAnimationAgent::InspectorAnimationAgent(InspectedFrames* inspectedFrames, InspectorDOMAgent* domAgent, InspectorCSSAgent* cssAgent, InjectedScriptManager* injectedScriptManager)
     : InspectorBaseAgent<InspectorAnimationAgent, InspectorFrontend::Animation>("Animation")
     , m_inspectedFrames(inspectedFrames)
     , m_domAgent(domAgent)
     , m_cssAgent(cssAgent)
     , m_injectedScriptManager(injectedScriptManager)
     , m_isCloning(false)
 {
 }
 
 void InspectorAnimationAgent::restore()
 {
     if (m_state->getBoolean(AnimationAgentState::animationAgentEnabled)) {

[pfeldman, 2015/11/27 03:53:30]

You should restore the playback rate here, not in enable.

         ErrorString error;
         enable(&error);
     }
 }
 
 void InspectorAnimationAgent::enable(ErrorString*)
 {
     m_state->setBoolean(AnimationAgentState::animationAgentEnabled, true);
     m_instrumentingAgents->setInspectorAnimationAgent(this);
+    double playbackRate = m_state->getDouble(AnimationAgentState::animationAgentPlaybackRate);

[pfeldman, 2015/11/27 03:53:30]

State should be clean on enable, this code belongs to ::restore. Restore is
pretty much dudCommitLoad that happened during the cross-process navigation.

[samli, 2015/11/27 04:10:55]

Oh, didn't realise restore() is called during the navigation.

+    if (playbackRate != 1 && playbackRate != 0)

[pfeldman, 2015/11/27 03:53:30]

why don't you restore 1 and 0?

[samli, 2015/11/27 04:10:55]

No need to restore 1, already 1. If its not in the state yet, playback rate is
0, which it should never be.

+        setPlaybackRate(nullptr, playbackRate);
 }
 
 void InspectorAnimationAgent::disable(ErrorString*)
 {
-    setPlaybackRate(nullptr, 1);
+    for (LocalFrame* frame : *m_inspectedFrames)
+        frame->document()->timeline().setPlaybackRate(1);
     m_state->setBoolean(AnimationAgentState::animationAgentEnabled, false);

[pfeldman, 2015/11/27 03:53:30]

You need to clear the rate here as well.

[samli, 2015/11/27 04:10:55]

Done.

     m_instrumentingAgents->setInspectorAnimationAgent(nullptr);
     m_idToAnimation.clear();
     m_idToAnimationType.clear();
     m_idToAnimationClone.clear();
 }
 
+void InspectorAnimationAgent::clearFrontend()
+{
+    setPlaybackRate(nullptr, 1);

[pfeldman, 2015/11/27 03:53:30]

Nothing should happen upon front-end disconnect - you should do all the cleanup
from within disable. After your agent has been disabled, it should leave no side
effects.

[samli, 2015/11/27 04:10:55]

Done.

+}
+
 void InspectorAnimationAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
 {
     if (frame == m_inspectedFrames->root()) {
         m_idToAnimation.clear();
         m_idToAnimationType.clear();
         m_idToAnimationClone.clear();
     }
+    double playbackRate = m_state->getDouble(AnimationAgentState::animationAgentPlaybackRate);
+    if (playbackRate != 1 && playbackRate != 0)
+        setPlaybackRate(nullptr, playbackRate);
 }
 
 static PassRefPtr<TypeBuilder::Animation::AnimationEffect> buildObjectForAnimationEffect(KeyframeEffect* effect, bool isTransition)
 {
     ComputedTimingProperties computedTiming;
     effect->computedTiming(computedTiming);
     double delay = computedTiming.delay();
     double duration = computedTiming.duration().getAsUnrestrictedDouble();
     String easing = effect->specifiedTiming().timingFunction->toString();
 
@@ skipping 98 matching lines @@
 
 void InspectorAnimationAgent::getPlaybackRate(ErrorString*, double* playbackRate)
 {
     *playbackRate = referenceTimeline().playbackRate();
 }
 
 void InspectorAnimationAgent::setPlaybackRate(ErrorString*, double playbackRate)
 {
     for (LocalFrame* frame : *m_inspectedFrames)
         frame->document()->timeline().setPlaybackRate(playbackRate);
+    m_state->setDouble(AnimationAgentState::animationAgentPlaybackRate, playbackRate);
 }
 
 void InspectorAnimationAgent::getCurrentTime(ErrorString* errorString, const String& id, double* currentTime)
 {
     Animation* animation = assertAnimation(errorString, id);
     if (!animation)
         return;
     if (m_idToAnimationClone.get(id))
         animation = m_idToAnimationClone.get(id);
 
@@ skipping 274 matching lines @@
     visitor->trace(m_cssAgent);
     visitor->trace(m_injectedScriptManager);
     visitor->trace(m_idToAnimation);
     visitor->trace(m_idToAnimationType);
     visitor->trace(m_idToAnimationClone);
 #endif
     InspectorBaseAgent::trace(visitor);
 }
 
 }