cc: Switch to Chromium DCHECKs and LOGs

cc/CCRendererGLTest.cpp

 // Copyright 2012 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 "CCRendererGL.h"
 
 #include "CCDrawQuad.h"
 #include "CCPrioritizedTextureManager.h"
 #include "CCResourceProvider.h"
@@ skipping 25 matching lines @@
     {
         if (name == GraphicsContext3D::EXTENSIONS)
             return WebString("GL_CHROMIUM_set_visibility GL_CHROMIUM_gpu_memory_manager GL_CHROMIUM_discard_framebuffer");
         return WebString();
     }
 
     // Methods added for test.
     int frameCount() { return m_frame; }
     void setMemoryAllocation(WebGraphicsMemoryAllocation allocation)
     {
-        ASSERT(CCProxy::isImplThread());
+        DCHECK(CCProxy::isImplThread());
         // In single threaded mode we expect this callback on main thread.
         DebugScopedSetMainThread main;
         m_memoryAllocationChangedCallback->onMemoryAllocationChanged(allocation);
     }
 
 private:
     int m_frame;
     WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* m_memoryAllocationChangedCallback;
 };
 
@@ skipping 187 matching lines @@
     {
         if (pname == GraphicsContext3D::MAX_TEXTURE_SIZE)
             *value = 1024; // MAX_TEXTURE_SIZE is cached client side, so it's OK to query.
         else
             ADD_FAILURE();
     }
 
     // We allow querying the shader compilation and program link status in debug mode, but not release.
     virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value)
     {
-#ifndef NDEBUG
-        *value = 1;
-#else
-        ADD_FAILURE();
-#endif
+        if (DCHECK_IS_ON())
+            *value = 1;
+        else
+            ADD_FAILURE();
     }
 
     virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value)
     {
-#ifndef NDEBUG
-        *value = 1;
-#else
-        ADD_FAILURE();
-#endif
+        if (DCHECK_IS_ON())
+            *value = 1;
+        else
+            ADD_FAILURE();
     }
 
     virtual WebString getString(WGC3Denum name)
     {
         // We allow querying the extension string.
         // FIXME: It'd be better to check that we only do this before starting any other expensive work (like starting a compilation)
         if (name != GraphicsContext3D::EXTENSIONS)
             ADD_FAILURE();
         return WebString();
     }
@@ skipping 118 matching lines @@
     FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
 
     mockClient.rootRenderPass()->setHasTransparentBackground(false);
 
     EXPECT_TRUE(renderer.initialize());
 
     renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPasses());
 
     // On DEBUG builds, render passes with opaque background clear to blue to
     // easily see regions that were not drawn on the screen.
-#if defined(NDEBUG)
-    EXPECT_EQ(0, context->clearCount());
-#else
-    EXPECT_EQ(1, context->clearCount());
-#endif
+    if (!DCHECK_IS_ON())
+        EXPECT_EQ(0, context->clearCount());
+    else
+        EXPECT_EQ(1, context->clearCount());
 }
 
 TEST(CCRendererGLTest2, transparentBackground)
 {
     FakeCCRendererClient mockClient;
     scoped_ptr<CCGraphicsContext> ccContext(FakeWebCompositorOutputSurface::create(adoptPtr(new ClearCountingContext)));
     ClearCountingContext* context = static_cast<ClearCountingContext*>(ccContext->context3D());
     OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(ccContext.get()));
     FakeCCRendererGL renderer(&mockClient, resourceProvider.get());
 
     mockClient.rootRenderPass()->setHasTransparentBackground(true);
 
     EXPECT_TRUE(renderer.initialize());
 
     renderer.drawFrame(mockClient.renderPassesInDrawOrder(), mockClient.renderPasses());
 
     EXPECT_EQ(1, context->clearCount());
 }