diff options
Diffstat (limited to 'cc/layer_animation_controller.cc')
| -rw-r--r-- | cc/layer_animation_controller.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc index 2025db8..20e4984 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)); - ASSERT(!toAdd->needsSynchronizedStartTime()); + DCHECK(!toAdd->needsSynchronizedStartTime()); controllerImpl->addAnimation(toAdd.Pass()); } } @@ -397,8 +397,7 @@ void CCLayerAnimationController::tickAnimations(double monotonicTime) // Do nothing for sentinel value. case CCActiveAnimation::TargetPropertyEnumSize: - ASSERT_NOT_REACHED(); - + NOTREACHED(); } } } |