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> | |
danakj
2016/04/25 22:06:23
rebase error? this is the only change in this file
tomhudson
2016/04/27 12:06:47
I'm assuming it was getting this header via some m
| |
8 | |
7 #include "cc/animation/animation_delegate.h" | 9 #include "cc/animation/animation_delegate.h" |
8 #include "cc/animation/animation_host.h" | 10 #include "cc/animation/animation_host.h" |
9 #include "cc/animation/animation_timeline.h" | 11 #include "cc/animation/animation_timeline.h" |
10 #include "cc/animation/element_animations.h" | 12 #include "cc/animation/element_animations.h" |
11 | 13 |
12 namespace cc { | 14 namespace cc { |
13 | 15 |
14 scoped_refptr<AnimationPlayer> AnimationPlayer::Create(int id) { | 16 scoped_refptr<AnimationPlayer> AnimationPlayer::Create(int id) { |
15 return make_scoped_refptr(new AnimationPlayer(id)); | 17 return make_scoped_refptr(new AnimationPlayer(id)); |
16 } | 18 } |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
219 } | 221 } |
220 } | 222 } |
221 | 223 |
222 void AnimationPlayer::SetNeedsCommit() { | 224 void AnimationPlayer::SetNeedsCommit() { |
223 DCHECK(animation_host_); | 225 DCHECK(animation_host_); |
224 animation_host_->SetNeedsCommit(); | 226 animation_host_->SetNeedsCommit(); |
225 animation_host_->SetNeedsRebuildPropertyTrees(); | 227 animation_host_->SetNeedsRebuildPropertyTrees(); |
226 } | 228 } |
227 | 229 |
228 } // namespace cc | 230 } // namespace cc |
OLD | NEW |