summaryrefslogtreecommitdiffstats
path: root/cc/layer_animation_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'cc/layer_animation_controller.cc')
-rw-r--r--cc/layer_animation_controller.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc
index 20e4984..2025db8 100644
--- a/cc/layer_animation_controller.cc
+++ b/cc/layer_animation_controller.cc
@@ -184,7 +184,7 @@ void CCLayerAnimationController::pushNewAnimationsToImplThread(CCLayerAnimationC
CCActiveAnimation::RunState initialRunState = CCActiveAnimation::WaitingForTargetAvailability;
double startTime = 0;
scoped_ptr<CCActiveAnimation> toAdd(m_activeAnimations[i]->cloneAndInitialize(CCActiveAnimation::ControllingInstance, initialRunState, startTime));
- DCHECK(!toAdd->needsSynchronizedStartTime());
+ ASSERT(!toAdd->needsSynchronizedStartTime());
controllerImpl->addAnimation(toAdd.Pass());
}
}
@@ -397,7 +397,8 @@ void CCLayerAnimationController::tickAnimations(double monotonicTime)
// Do nothing for sentinel value.
case CCActiveAnimation::TargetPropertyEnumSize:
- NOTREACHED();
+ ASSERT_NOT_REACHED();
+
}
}
}