summaryrefslogtreecommitdiffstats
path: root/cc/layer_animation_controller.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:50:19 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 00:50:19 +0000
commitbc3847a1ba39db7adec20aa9e0565f6e868e8480 (patch)
tree572eb2450ffd1bcee7f1932974f04de80c179e90 /cc/layer_animation_controller.cc
parenteff7a36630d6c8f86921dff9128c8be47d7c5021 (diff)
downloadchromium_src-bc3847a1ba39db7adec20aa9e0565f6e868e8480.zip
chromium_src-bc3847a1ba39db7adec20aa9e0565f6e868e8480.tar.gz
chromium_src-bc3847a1ba39db7adec20aa9e0565f6e868e8480.tar.bz2
cc: Switch to Chromium DCHECKs LOGs
We can't compile-guard code and use DCHECK since it can be enabled at runtime. This removes all compile-time guards, and makes use of DCHECK instead of ASSERT. We use DCHECK_IS_ON() to early out and avoid extra work just for DCHECK where possible as well. This also replaces use of LOG_ERROR("Foo") with LOG(ERROR)<<"Foo"; R=enne,jamesr Review URL: https://chromiumcodereview.appspot.com/11048044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_animation_controller.cc')
-rw-r--r--cc/layer_animation_controller.cc5
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();
}
}
}