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

Unified Diff: cc/animation/animation_player.cc

Issue 1421483005: Reland: Remove DCHECK_IMPLIES/CHECK_IMPLIES. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/animation_player.cc
diff --git a/cc/animation/animation_player.cc b/cc/animation/animation_player.cc
index 0bec9265426789d5dd537e56913198e88d4624cb..0c380118987882b29692f850b4b8c26c8e769fcf 100644
--- a/cc/animation/animation_player.cc
+++ b/cc/animation/animation_player.cc
@@ -119,9 +119,8 @@ void AnimationPlayer::UnbindElementAnimations() {
}
void AnimationPlayer::AddAnimation(scoped_ptr<Animation> animation) {
- DCHECK_IMPLIES(
- animation->target_property() == Animation::SCROLL_OFFSET,
- animation_host_ && animation_host_->SupportsScrollAnimations());
+ DCHECK(animation->target_property() != Animation::SCROLL_OFFSET ||
+ (animation_host_ && animation_host_->SupportsScrollAnimations()));
if (element_animations_) {
element_animations_->layer_animation_controller()->AddAnimation(
« 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