| Index: third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| index 7b2c1ea26302936149a29143f88714e313985ff6..eb6297f4592dc27ccd64a0fc08ec7ea061648192 100644
|
| --- a/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CompositorAnimations.cpp
|
| @@ -377,13 +377,15 @@ void CompositorAnimations::StartAnimationOnCompositor(
|
| double start_time,
|
| double time_offset,
|
| const Timing& timing,
|
| - const Animation& animation,
|
| + const Animation* animation,
|
| + CompositorAnimationPlayer* compositor_player,
|
| const EffectModel& effect,
|
| Vector<int>& started_animation_ids,
|
| double animation_playback_rate) {
|
| + DCHECK(compositor_player);
|
| DCHECK(started_animation_ids.IsEmpty());
|
| - DCHECK(IsCandidateForAnimationOnCompositor(timing, element, &animation,
|
| - effect, animation_playback_rate));
|
| + DCHECK(IsCandidateForAnimationOnCompositor(timing, element, animation, effect,
|
| + animation_playback_rate));
|
| DCHECK(CanStartAnimationOnCompositor(element));
|
|
|
| const KeyframeEffectModelBase& keyframe_effect =
|
| @@ -396,8 +398,6 @@ void CompositorAnimations::StartAnimationOnCompositor(
|
| DCHECK(!animations.IsEmpty());
|
| for (auto& compositor_animation : animations) {
|
| int id = compositor_animation->Id();
|
| - CompositorAnimationPlayer* compositor_player = animation.CompositorPlayer();
|
| - DCHECK(compositor_player);
|
| compositor_player->AddAnimation(std::move(compositor_animation));
|
| started_animation_ids.push_back(id);
|
| }
|
|
|