diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/cc/animation/worklet_animation.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/animation/worklet_animation.cc')
-rw-r--r-- | chromium/cc/animation/worklet_animation.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chromium/cc/animation/worklet_animation.cc b/chromium/cc/animation/worklet_animation.cc index 17ed083efcc..fd9a9c700ea 100644 --- a/chromium/cc/animation/worklet_animation.cc +++ b/chromium/cc/animation/worklet_animation.cc @@ -92,7 +92,8 @@ void WorkletAnimation::Tick(base::TimeTicks monotonic_time) { // animations lifecycle. To avoid this we pause the underlying keyframe effect // at the local time obtained from the user script - essentially turning each // call to |WorkletAnimation::Tick| into a seek in the effect. - TickWithLocalTime(local_time_.value()); + keyframe_effect_->Pause(local_time_.value()); + keyframe_effect_->Tick(base::TimeTicks()); } void WorkletAnimation::UpdateState(bool start_ready_animations, @@ -162,10 +163,6 @@ void WorkletAnimation::UpdateInputState(MutatorInputState* input_state, switch (state_) { case State::PENDING: - // TODO(yigu): cc side WorkletAnimation is only capable of handling single - // keyframe effect at the moment. We should pass in the number of effects - // once Worklet Group Effect is fully implemented in cc. - // https://crbug.com/767043. input_state->Add({worklet_animation_id(), name(), current_time->InMillisecondsF(), CloneOptions(), CloneEffectTimings()}); @@ -186,8 +183,6 @@ void WorkletAnimation::UpdateInputState(MutatorInputState* input_state, void WorkletAnimation::SetOutputState( const MutatorOutputState::AnimationState& state) { - // TODO(yigu): cc side WorkletAnimation is only capable of handling single - // keyframe effect at the moment. https://crbug.com/767043. DCHECK_EQ(state.local_times.size(), 1u); local_time_ = state.local_times[0]; } |