Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(671)

Side by Side Diff: cc/animation/animation_player.cc

Issue 2377223002: CC Animations: Rewrite unit tests to work with AnimationPlayer. (Closed)
Patch Set: Reparent. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/animation/animation_player.h ('k') | cc/animation/animation_player_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_host.h" 11 #include "cc/animation/animation_host.h"
11 #include "cc/animation/animation_timeline.h" 12 #include "cc/animation/animation_timeline.h"
12 #include "cc/animation/property_animation_state.h" 13 #include "cc/animation/property_animation_state.h"
13 #include "cc/animation/scroll_offset_animation_curve.h" 14 #include "cc/animation/scroll_offset_animation_curve.h"
14 15
15 namespace cc { 16 namespace cc {
16 17
17 scoped_refptr<AnimationPlayer> AnimationPlayer::Create(int id) { 18 scoped_refptr<AnimationPlayer> AnimationPlayer::Create(int id) {
18 return make_scoped_refptr(new AnimationPlayer(id)); 19 return make_scoped_refptr(new AnimationPlayer(id));
19 } 20 }
(...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 AnimationPlayer* animation_player_impl) { 1114 AnimationPlayer* animation_player_impl) {
1114 for (size_t i = 0; i < animations_.size(); ++i) { 1115 for (size_t i = 0; i < animations_.size(); ++i) {
1115 Animation* current_impl = 1116 Animation* current_impl =
1116 animation_player_impl->GetAnimationById(animations_[i]->id()); 1117 animation_player_impl->GetAnimationById(animations_[i]->id());
1117 if (current_impl) 1118 if (current_impl)
1118 animations_[i]->PushPropertiesTo(current_impl); 1119 animations_[i]->PushPropertiesTo(current_impl);
1119 } 1120 }
1120 } 1121 }
1121 1122
1122 } // namespace cc 1123 } // namespace cc
OLDNEW
« no previous file with comments | « cc/animation/animation_player.h ('k') | cc/animation/animation_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698