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

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

Issue 1587073011: Plumb NotifyAnimationAborted from the compositor to blink animation delegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: initialize aborted_ in unittest Created 4 years, 11 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/element_animations.h » ('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 "cc/animation/animation_delegate.h" 7 #include "cc/animation/animation_delegate.h"
8 #include "cc/animation/animation_host.h" 8 #include "cc/animation/animation_host.h"
9 #include "cc/animation/animation_timeline.h" 9 #include "cc/animation/animation_timeline.h"
10 #include "cc/animation/element_animations.h" 10 #include "cc/animation/element_animations.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 void AnimationPlayer::NotifyAnimationFinished( 181 void AnimationPlayer::NotifyAnimationFinished(
182 base::TimeTicks monotonic_time, 182 base::TimeTicks monotonic_time,
183 Animation::TargetProperty target_property, 183 Animation::TargetProperty target_property,
184 int group) { 184 int group) {
185 if (layer_animation_delegate_) 185 if (layer_animation_delegate_)
186 layer_animation_delegate_->NotifyAnimationFinished(monotonic_time, 186 layer_animation_delegate_->NotifyAnimationFinished(monotonic_time,
187 target_property, group); 187 target_property, group);
188 } 188 }
189 189
190 void AnimationPlayer::NotifyAnimationAborted(
191 base::TimeTicks monotonic_time,
192 Animation::TargetProperty target_property,
193 int group) {
194 if (layer_animation_delegate_)
195 layer_animation_delegate_->NotifyAnimationAborted(monotonic_time,
196 target_property, group);
197 }
198
190 void AnimationPlayer::SetNeedsCommit() { 199 void AnimationPlayer::SetNeedsCommit() {
191 DCHECK(animation_host_); 200 DCHECK(animation_host_);
192 animation_host_->SetNeedsCommit(); 201 animation_host_->SetNeedsCommit();
193 animation_host_->SetNeedsRebuildPropertyTrees(); 202 animation_host_->SetNeedsRebuildPropertyTrees();
194 } 203 }
195 204
196 } // namespace cc 205 } // namespace cc
OLDNEW
« no previous file with comments | « cc/animation/animation_player.h ('k') | cc/animation/element_animations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698