| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/animation/animation_player.h" | 5 #include "cc/animation/animation_player.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "cc/animation/animation_delegate.h" | 9 #include "cc/animation/animation_delegate.h" |
| 10 #include "cc/animation/animation_events.h" | 10 #include "cc/animation/animation_events.h" |
| 11 #include "cc/animation/animation_host.h" | 11 #include "cc/animation/animation_host.h" |
| 12 #include "cc/animation/animation_timeline.h" | 12 #include "cc/animation/animation_timeline.h" |
| 13 #include "cc/animation/property_animation_state.h" | |
| 14 #include "cc/animation/scroll_offset_animation_curve.h" | 13 #include "cc/animation/scroll_offset_animation_curve.h" |
| 14 #include "cc/trees/property_animation_state.h" |
| 15 | 15 |
| 16 namespace cc { | 16 namespace cc { |
| 17 | 17 |
| 18 scoped_refptr<AnimationPlayer> AnimationPlayer::Create(int id) { | 18 scoped_refptr<AnimationPlayer> AnimationPlayer::Create(int id) { |
| 19 return make_scoped_refptr(new AnimationPlayer(id)); | 19 return make_scoped_refptr(new AnimationPlayer(id)); |
| 20 } | 20 } |
| 21 | 21 |
| 22 AnimationPlayer::AnimationPlayer(int id) | 22 AnimationPlayer::AnimationPlayer(int id) |
| 23 : animation_host_(), | 23 : animation_host_(), |
| 24 animation_timeline_(), | 24 animation_timeline_(), |
| (...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1114 AnimationPlayer* animation_player_impl) { | 1114 AnimationPlayer* animation_player_impl) { |
| 1115 for (size_t i = 0; i < animations_.size(); ++i) { | 1115 for (size_t i = 0; i < animations_.size(); ++i) { |
| 1116 Animation* current_impl = | 1116 Animation* current_impl = |
| 1117 animation_player_impl->GetAnimationById(animations_[i]->id()); | 1117 animation_player_impl->GetAnimationById(animations_[i]->id()); |
| 1118 if (current_impl) | 1118 if (current_impl) |
| 1119 animations_[i]->PushPropertiesTo(current_impl); | 1119 animations_[i]->PushPropertiesTo(current_impl); |
| 1120 } | 1120 } |
| 1121 } | 1121 } |
| 1122 | 1122 |
| 1123 } // namespace cc | 1123 } // namespace cc |
| OLD | NEW |