| Index: cc/threaded_unittest.cc
|
| diff --git a/cc/threaded_unittest.cc b/cc/threaded_unittest.cc
|
| index 66a5a2d10bcc3d5208514470fcc61d02cadc7edb..61837fd058c31b551ee52c34176b3af3a18d8696 100644
|
| --- a/cc/threaded_unittest.cc
|
| +++ b/cc/threaded_unittest.cc
|
| @@ -379,7 +379,7 @@ void CCThreadedTest::postDidAddAnimationToMainThread()
|
|
|
| void CCThreadedTest::doBeginTest()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
| m_client = MockLayerTreeHostClient::create(this);
|
|
|
| scoped_refptr<LayerChromium> rootLayer = LayerChromium::create();
|
| @@ -412,13 +412,13 @@ void CCThreadedTest::scheduleComposite()
|
|
|
| void CCThreadedTest::realEndTest()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
| WebKit::Platform::current()->currentThread()->exitRunLoop();
|
| }
|
|
|
| void CCThreadedTest::dispatchSetNeedsAnimate()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -429,7 +429,7 @@ void CCThreadedTest::dispatchSetNeedsAnimate()
|
|
|
| void CCThreadedTest::dispatchAddInstantAnimation()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -440,7 +440,7 @@ void CCThreadedTest::dispatchAddInstantAnimation()
|
|
|
| void CCThreadedTest::dispatchAddAnimation()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -451,7 +451,7 @@ void CCThreadedTest::dispatchAddAnimation()
|
|
|
| void CCThreadedTest::dispatchSetNeedsAnimateAndCommit()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -464,7 +464,7 @@ void CCThreadedTest::dispatchSetNeedsAnimateAndCommit()
|
|
|
| void CCThreadedTest::dispatchSetNeedsCommit()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -475,7 +475,7 @@ void CCThreadedTest::dispatchSetNeedsCommit()
|
|
|
| void CCThreadedTest::dispatchAcquireLayerTextures()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -486,7 +486,7 @@ void CCThreadedTest::dispatchAcquireLayerTextures()
|
|
|
| void CCThreadedTest::dispatchSetNeedsRedraw()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -497,7 +497,7 @@ void CCThreadedTest::dispatchSetNeedsRedraw()
|
|
|
| void CCThreadedTest::dispatchSetVisible(bool visible)
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -515,7 +515,7 @@ void CCThreadedTest::dispatchComposite()
|
|
|
| void CCThreadedTest::dispatchDidAddAnimation()
|
| {
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
|
|
| if (m_finished)
|
| return;
|
| @@ -535,7 +535,7 @@ void CCThreadedTest::runTest(bool threaded)
|
| } else
|
| Platform::current()->compositorSupport()->initialize(0);
|
|
|
| - ASSERT(CCProxy::isMainThread());
|
| + DCHECK(CCProxy::isMainThread());
|
| m_mainThreadProxy = CCScopedThreadProxy::create(CCProxy::mainThread());
|
|
|
| initializeSettings(m_settings);
|
|
|