| Index: cc/layer_animation_controller.cc
|
| diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc
|
| index 2025db8616fc6b0725a45b88f26a0a4a5b960bfb..20e4984ce309ce74d6b246e24d0b5fc572e5e7c9 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();
|
| }
|
| }
|
| }
|
|
|