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

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

Issue 1417903005: Revert of Remove DCHECK_IMPLIES/CHECK_IMPLIES. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « base/trace_event/trace_log.cc ('k') | cc/input/top_controls_manager.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 "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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 SetNeedsCommit(); 112 SetNeedsCommit();
113 animations_.clear(); 113 animations_.clear();
114 } 114 }
115 115
116 void AnimationPlayer::UnbindElementAnimations() { 116 void AnimationPlayer::UnbindElementAnimations() {
117 element_animations_ = nullptr; 117 element_animations_ = nullptr;
118 DCHECK(animations_.empty()); 118 DCHECK(animations_.empty());
119 } 119 }
120 120
121 void AnimationPlayer::AddAnimation(scoped_ptr<Animation> animation) { 121 void AnimationPlayer::AddAnimation(scoped_ptr<Animation> animation) {
122 DCHECK(animation->target_property() != Animation::SCROLL_OFFSET || 122 DCHECK_IMPLIES(
123 (animation_host_ && animation_host_->SupportsScrollAnimations())); 123 animation->target_property() == Animation::SCROLL_OFFSET,
124 animation_host_ && animation_host_->SupportsScrollAnimations());
124 125
125 if (element_animations_) { 126 if (element_animations_) {
126 element_animations_->layer_animation_controller()->AddAnimation( 127 element_animations_->layer_animation_controller()->AddAnimation(
127 animation.Pass()); 128 animation.Pass());
128 SetNeedsCommit(); 129 SetNeedsCommit();
129 } else { 130 } else {
130 animations_.push_back(animation.Pass()); 131 animations_.push_back(animation.Pass());
131 } 132 }
132 } 133 }
133 134
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 target_property, group); 181 target_property, group);
181 } 182 }
182 183
183 void AnimationPlayer::SetNeedsCommit() { 184 void AnimationPlayer::SetNeedsCommit() {
184 DCHECK(animation_host_); 185 DCHECK(animation_host_);
185 animation_host_->SetNeedsCommit(); 186 animation_host_->SetNeedsCommit();
186 animation_host_->SetNeedsRebuildPropertyTrees(); 187 animation_host_->SetNeedsRebuildPropertyTrees();
187 } 188 }
188 189
189 } // namespace cc 190 } // namespace cc
OLDNEW
« no previous file with comments | « base/trace_event/trace_log.cc ('k') | cc/input/top_controls_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698