cc: Switch to Chromium DCHECKs and LOGs

cc/CCVideoLayerImpl.cpp

 // 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"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "CCVideoLayerImpl.h"
 
@@ skipping 22 matching lines @@
     m_streamTextureMatrix = WebKit::WebTransformationMatrix(
         1, 0, 0, 0,
         0, -1, 0, 0,
         0, 0, 1, 0,
         0, 1, 0, 1);
 
     // This only happens during a commit on the compositor thread while the main
     // thread is blocked. That makes this a thread-safe call to set the video
     // frame provider client that does not require a lock. The same is true of
     // the call in the destructor.
-    ASSERT(CCProxy::isMainThreadBlocked());
+    DCHECK(CCProxy::isMainThreadBlocked());
     m_provider->setVideoFrameProviderClient(this);
 }
 
 CCVideoLayerImpl::~CCVideoLayerImpl()
 {
     // See comment in constructor for why this doesn't need a lock.
-    ASSERT(CCProxy::isMainThreadBlocked());
+    DCHECK(CCProxy::isMainThreadBlocked());
     if (m_provider) {
         m_provider->setVideoFrameProviderClient(0);
         m_provider = 0;
     }
     freePlaneData(layerTreeHostImpl()->resourceProvider());
 
-#if !ASSERT_DISABLED
-    for (unsigned i = 0; i < WebKit::WebVideoFrame::maxPlanes; ++i)
-        ASSERT(!m_framePlanes[i].resourceId);
-    ASSERT(!m_externalTextureResource);
-#endif
+    if (DCHECK_IS_ON()) {
+        for (unsigned i = 0; i < WebKit::WebVideoFrame::maxPlanes; ++i)
+            DCHECK(!m_framePlanes[i].resourceId);
+        DCHECK(!m_externalTextureResource);
+    }
 }
 
 void CCVideoLayerImpl::stopUsingProvider()
 {
     // Block the provider from shutting down until this client is done
     // using the frame.
     MutexLocker locker(m_providerMutex);
-    ASSERT(!m_frame);
+    DCHECK(!m_frame);
     m_provider = 0;
 }
 
 // Convert WebKit::WebVideoFrame::Format to GraphicsContext3D's format enum values.
 static GC3Denum convertVFCFormatToGC3DFormat(const WebKit::WebVideoFrame& frame)
 {
     switch (frame.format()) {
     case WebKit::WebVideoFrame::FormatYV12:
     case WebKit::WebVideoFrame::FormatYV16:
         return GraphicsContext3D::LUMINANCE;
     case WebKit::WebVideoFrame::FormatNativeTexture:
         return frame.textureTarget();
     case WebKit::WebVideoFrame::FormatInvalid:
     case WebKit::WebVideoFrame::FormatRGB32:
     case WebKit::WebVideoFrame::FormatEmpty:
     case WebKit::WebVideoFrame::FormatI420:
         notImplemented();
     }
     return GraphicsContext3D::INVALID_VALUE;
 }
 
 void CCVideoLayerImpl::willDraw(CCResourceProvider* resourceProvider)
 {
-    ASSERT(CCProxy::isImplThread());
+    DCHECK(CCProxy::isImplThread());
     CCLayerImpl::willDraw(resourceProvider);
 
     // Explicitly lock and unlock the provider mutex so it can be held from
     // willDraw to didDraw. Since the compositor thread is in the middle of
     // drawing, the layer will not be destroyed before didDraw is called.
     // Therefore, the only thing that will prevent this lock from being released
     // is the GPU process locking it. As the GPU process can't cause the
     // destruction of the provider (calling stopUsingProvider), holding this
     // lock should not cause a deadlock.
     m_providerMutex.lock();
 
     willDrawInternal(resourceProvider);
     freeUnusedPlaneData(resourceProvider);
 
     if (!m_frame)
         m_providerMutex.unlock();
 }
 
 void CCVideoLayerImpl::willDrawInternal(CCResourceProvider* resourceProvider)
 {
-    ASSERT(CCProxy::isImplThread());
-    ASSERT(!m_externalTextureResource);
+    DCHECK(CCProxy::isImplThread());
+    DCHECK(!m_externalTextureResource);
 
     if (!m_provider) {
         m_frame = 0;
         return;
     }
 
     m_frame = m_provider->getCurrentFrame();
 
     if (!m_frame)
         return;
@@ skipping 23 matching lines @@
         m_frame = 0;
         return;
     }
 
     if (m_format == GraphicsContext3D::TEXTURE_2D)
         m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_frame->textureId());
 }
 
 void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
 {
-    ASSERT(CCProxy::isImplThread());
+    DCHECK(CCProxy::isImplThread());
 
     if (!m_frame)
         return;
 
     CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
     appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
 
     // FIXME: When we pass quads out of process, we need to double-buffer, or
     // otherwise synchonize use of all textures in the quad.
 
@@ skipping 42 matching lines @@
         quadSink.append(streamVideoQuad.PassAs<CCDrawQuad>(), appendQuadsData);
         break;
     }
     default:
         CRASH(); // Someone updated convertVFCFormatToGC3DFormat above but update this!
     }
 }
 
 void CCVideoLayerImpl::didDraw(CCResourceProvider* resourceProvider)
 {
-    ASSERT(CCProxy::isImplThread());
+    DCHECK(CCProxy::isImplThread());
     CCLayerImpl::didDraw(resourceProvider);
 
     if (!m_frame)
         return;
 
     if (m_format == GraphicsContext3D::TEXTURE_2D) {
-        ASSERT(m_externalTextureResource);
+        DCHECK(m_externalTextureResource);
         // FIXME: the following assert will not be true when sending resources to a
         // parent compositor. We will probably need to hold on to m_frame for
         // longer, and have several "current frames" in the pipeline.
-        ASSERT(!resourceProvider->inUseByConsumer(m_externalTextureResource));
+        DCHECK(!resourceProvider->inUseByConsumer(m_externalTextureResource));
         resourceProvider->deleteResource(m_externalTextureResource);
         m_externalTextureResource = 0;
     }
 
     m_provider->putCurrentFrame(m_frame);
     m_frame = 0;
 
     m_providerMutex.unlock();
 }
 
@@ skipping 138 matching lines @@
 }
 
 const char* CCVideoLayerImpl::layerTypeAsString() const
 {
     return "VideoLayer";
 }
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)