diff options
Diffstat (limited to 'chromium/cc/animation/animation.cc')
| -rw-r--r-- | chromium/cc/animation/animation.cc | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/chromium/cc/animation/animation.cc b/chromium/cc/animation/animation.cc index 5c40eed8453..df27dc32d11 100644 --- a/chromium/cc/animation/animation.cc +++ b/chromium/cc/animation/animation.cc @@ -127,20 +127,15 @@ void Animation::Tick(base::TimeTicks tick_time) { // time and then ticks it which side-steps the start time altogether. See // crbug.com/1076012 for alternative design choices considered for future // improvement. - TickWithLocalTime(tick_time - base::TimeTicks()); + keyframe_effect_->Pause(tick_time - base::TimeTicks(), + PauseCondition::kAfterStart); + keyframe_effect_->Tick(base::TimeTicks()); } else { DCHECK(!tick_time.is_null()); keyframe_effect_->Tick(tick_time); } } -void Animation::TickWithLocalTime(base::TimeDelta local_time) { - // TODO(yigu): KeyframeEffect should support ticking KeyframeModel - // directly without using Pause(). https://crbug.com/1076012. - keyframe_effect_->Pause(local_time); - keyframe_effect_->Tick(base::TimeTicks()); -} - bool Animation::IsScrollLinkedAnimation() const { return animation_timeline_ && animation_timeline_->IsScrollTimeline(); } @@ -211,10 +206,6 @@ void Animation::DelegateAnimationEvent(const AnimationEvent& event) { } } -size_t Animation::TickingKeyframeModelsCount() const { - return keyframe_effect_->TickingKeyframeModelsCount(); -} - bool Animation::AffectsCustomProperty() const { return keyframe_effect_->AffectsCustomProperty(); } @@ -287,12 +278,4 @@ void Animation::NotifyKeyframeModelFinishedForTesting( DispatchAndDelegateAnimationEvent(event); } -void Animation::UpdateScrollTimeline(base::Optional<ElementId> scroller_id, - base::Optional<double> start_scroll_offset, - base::Optional<double> end_scroll_offset) { - ToScrollTimeline(animation_timeline_) - ->UpdateScrollerIdAndScrollOffsets(scroller_id, start_scroll_offset, - end_scroll_offset); -} - } // namespace cc |