cc: Switch to Chromium DCHECKs and LOGs

cc/threaded_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCThreadedTest.h"
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationTestCommon.h"
@@ skipping 361 matching lines @@
     m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadedTest::dispatchSetVisible, visible));
 }
 
 void CCThreadedTest::postDidAddAnimationToMainThread()
 {
     m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadedTest::dispatchDidAddAnimation));
 }
 
 void CCThreadedTest::doBeginTest()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
     m_client = MockLayerTreeHostClient::create(this);
 
     scoped_refptr<LayerChromium> rootLayer = LayerChromium::create();
     m_layerTreeHost = MockLayerTreeHost::create(this, m_client.get(), rootLayer, m_settings);
     ASSERT_TRUE(m_layerTreeHost.get());
     rootLayer->setLayerTreeHost(m_layerTreeHost.get());
     m_layerTreeHost->setSurfaceReady();
 
     m_started = true;
     m_beginning = true;
@@ skipping 12 matching lines @@
 void CCThreadedTest::scheduleComposite()
 {
     if (!m_started || m_scheduled || m_finished)
         return;
     m_scheduled = true;
     m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadedTest::dispatchComposite));
 }
 
 void CCThreadedTest::realEndTest()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
     WebKit::Platform::current()->currentThread()->exitRunLoop();
 }
 
 void CCThreadedTest::dispatchSetNeedsAnimate()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get())
         m_layerTreeHost->setNeedsAnimate();
 }
 
 void CCThreadedTest::dispatchAddInstantAnimation()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
         addOpacityTransitionToLayer(*m_layerTreeHost->rootLayer(), 0, 0, 0.5, false);
 }
 
 void CCThreadedTest::dispatchAddAnimation()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
         addOpacityTransitionToLayer(*m_layerTreeHost->rootLayer(), 10, 0, 0.5, true);
 }
 
 void CCThreadedTest::dispatchSetNeedsAnimateAndCommit()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get()) {
         m_layerTreeHost->setNeedsAnimate();
         m_layerTreeHost->setNeedsCommit();
     }
 }
 
 void CCThreadedTest::dispatchSetNeedsCommit()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get())
         m_layerTreeHost->setNeedsCommit();
 }
 
 void CCThreadedTest::dispatchAcquireLayerTextures()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get())
         m_layerTreeHost->acquireLayerTextures();
 }
 
 void CCThreadedTest::dispatchSetNeedsRedraw()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get())
         m_layerTreeHost->setNeedsRedraw();
 }
 
 void CCThreadedTest::dispatchSetVisible(bool visible)
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get())
         m_layerTreeHost->setVisible(visible);
 }
 
 void CCThreadedTest::dispatchComposite()
 {
     m_scheduled = false;
     if (m_layerTreeHost.get() && !m_finished)
         m_layerTreeHost->composite();
 }
 
 void CCThreadedTest::dispatchDidAddAnimation()
 {
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
 
     if (m_finished)
         return;
 
     if (m_layerTreeHost.get())
         m_layerTreeHost->didAddAnimation();
 }
 
 void CCThreadedTest::runTest(bool threaded)
 {
     // For these tests, we will enable threaded animations.
     Platform::current()->compositorSupport()->setAcceleratedAnimationEnabled(true);
 
     if (threaded) {
         m_webThread = adoptPtr(WebKit::Platform::current()->createThread("CCThreadedTest"));
         Platform::current()->compositorSupport()->initialize(m_webThread.get());
     } else
         Platform::current()->compositorSupport()->initialize(0);
 
-    ASSERT(CCProxy::isMainThread());
+    CC_DCHECK(CCProxy::isMainThread());
     m_mainThreadProxy = CCScopedThreadProxy::create(CCProxy::mainThread());
 
     initializeSettings(m_settings);
 
     m_beginTask = new BeginTask(this);
     WebKit::Platform::current()->currentThread()->postDelayedTask(m_beginTask, 0); // postDelayedTask takes ownership of the task
     m_timeoutTask = new TimeoutTask(this);
     WebKit::Platform::current()->currentThread()->postDelayedTask(m_timeoutTask, 5000);
     WebKit::Platform::current()->currentThread()->enterRunLoop();
 
     if (m_layerTreeHost.get() && m_layerTreeHost->rootLayer())
         m_layerTreeHost->rootLayer()->setLayerTreeHost(0);
     m_layerTreeHost.reset();
 
     if (m_timeoutTask)
         m_timeoutTask->clearTest();
 
     ASSERT_FALSE(m_layerTreeHost.get());
     m_client.clear();
     if (m_timedOut) {
         FAIL() << "Test timed out";
         Platform::current()->compositorSupport()->shutdown();
         return;
     }
     afterTest();
     Platform::current()->compositorSupport()->shutdown();
 }
 
 }  // namespace WebKitTests