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

Unified Diff: cc/animation/animation_player.cc

Issue 1009233002: CC Animations: Port Impl-only-scrolling to use compositor animation timelines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ui
Patch Set: CC_EXPORT for MutatorHostClient Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: cc/animation/animation_player.cc
diff --git a/cc/animation/animation_player.cc b/cc/animation/animation_player.cc
index 603ffa97e939d10368c37a6d7808cce02ececd20..e6677bb1cd7cf5961fd11d8e348108840404d7ac 100644
--- a/cc/animation/animation_player.cc
+++ b/cc/animation/animation_player.cc
@@ -119,6 +119,9 @@ void AnimationPlayer::UnbindElementAnimations() {
}
void AnimationPlayer::AddAnimation(scoped_ptr<Animation> animation) {
+ DCHECK(animation->target_property() != Animation::SCROLL_OFFSET ||
+ (animation_host_ && animation_host_->SupportsScrollAnimations()));
+
if (element_animations_) {
element_animations_->layer_animation_controller()->AddAnimation(
animation.Pass());

Powered by Google App Engine
This is Rietveld 408576698