cc: Switch to Chromium DCHECKs and LOGs

cc/resource_provider.cc

Index: cc/resource_provider.cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index ff917b0227ed20ccad7408b25d7d6373cc052fd2..76768ad80292024c5452c9963849e59e910a1de4 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -39,7 +39,7 @@ static GC3Denum textureToStorageFormat(GC3Denum textureFormat)
         storageFormat = Extensions3DChromium::BGRA8_EXT;
         break;
     default:
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
         break;
     }
 
@@ -131,13 +131,13 @@ CCResourceProvider::~CCResourceProvider()
 
 WebGraphicsContext3D* CCResourceProvider::graphicsContext3D()
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     return m_context->context3D();
 }
 
 bool CCResourceProvider::inUseByConsumer(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -154,7 +154,7 @@ CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, cons
     case GLTexture:
         return createGLTexture(pool, size, format, hint);
     case Bitmap:
-        ASSERT(format == GraphicsContext3D::RGBA);
+        CC_DCHECK(format == GraphicsContext3D::RGBA);
         return createBitmap(pool, size);
     }
 
@@ -164,10 +164,10 @@ CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, cons
 
 CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     unsigned textureId = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
-    ASSERT(context3d);
+    CC_DCHECK(context3d);
     GLC(context3d, textureId = context3d->createTexture());
     GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId));
     GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
@@ -190,7 +190,7 @@ CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, con
 
 CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const IntSize& size)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
 
     uint8_t* pixels = new uint8_t[size.width() * size.height() * 4];
 
@@ -202,8 +202,8 @@ CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const
 
 CCResourceProvider::ResourceId CCResourceProvider::createResourceFromExternalTexture(unsigned textureId)
 {
-    ASSERT(CCProxy::isImplThread());
-    ASSERT(m_context->context3D());
+    CC_DCHECK(CCProxy::isImplThread());
+    CC_DCHECK(m_context->context3D());
     ResourceId id = m_nextId++;
     Resource resource(textureId, 0, IntSize(), 0);
     resource.external = true;
@@ -213,7 +213,7 @@ CCResourceProvider::ResourceId CCResourceProvider::createResourceFromExternalTex
 
 void CCResourceProvider::deleteResource(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -221,9 +221,9 @@ void CCResourceProvider::deleteResource(ResourceId id)
 #else
     Resource* resource = &it->second;
 #endif
-    ASSERT(!resource->lockedForWrite);
-    ASSERT(!resource->lockForReadCount);
-    ASSERT(!resource->markedForDeletion);
+    CC_DCHECK(!resource->lockedForWrite);
+    CC_DCHECK(!resource->lockForReadCount);
+    CC_DCHECK(!resource->markedForDeletion);
 
     if (resource->exported) {
         resource->markedForDeletion = true;
@@ -241,7 +241,7 @@ void CCResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
 #endif
     if (resource->glId && !resource->external) {
         WebGraphicsContext3D* context3d = m_context->context3D();
-        ASSERT(context3d);
+        CC_DCHECK(context3d);
         GLC(context3d, context3d->deleteTexture(resource->glId));
     }
     if (resource->pixels)
@@ -252,7 +252,7 @@ void CCResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
 
 void CCResourceProvider::deleteOwnedResources(int pool)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceIdArray toDelete;
     for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -281,7 +281,7 @@ CCResourceProvider::ResourceType CCResourceProvider::resourceType(ResourceId id)
 
 void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRect& imageRect, const IntRect& sourceRect, const IntSize& destOffset)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -289,15 +289,15 @@ void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRe
 #else
     Resource* resource = &it->second;
 #endif
-    ASSERT(!resource->lockedForWrite);
-    ASSERT(!resource->lockForReadCount);
-    ASSERT(!resource->external);
-    ASSERT(!resource->exported);
+    CC_DCHECK(!resource->lockedForWrite);
+    CC_DCHECK(!resource->lockForReadCount);
+    CC_DCHECK(!resource->external);
+    CC_DCHECK(!resource->exported);
 
     if (resource->glId) {
         WebGraphicsContext3D* context3d = m_context->context3D();
-        ASSERT(context3d);
-        ASSERT(m_texSubImage.get());
+        CC_DCHECK(context3d);
+        CC_DCHECK(m_texSubImage.get());
         context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId);
         m_texSubImage->upload(image, imageRect, sourceRect, destOffset, resource->format, context3d);
     }
@@ -319,7 +319,7 @@ void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRe
 
 void CCResourceProvider::flush()
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (context3d)
         context3d->flush();
@@ -327,7 +327,7 @@ void CCResourceProvider::flush()
 
 bool CCResourceProvider::shallowFlushIfSupported()
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !m_useShallowFlush)
         return false;
@@ -338,7 +338,7 @@ bool CCResourceProvider::shallowFlushIfSupported()
 
 const CCResourceProvider::Resource* CCResourceProvider::lockForRead(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 
@@ -347,15 +347,15 @@ const CCResourceProvider::Resource* CCResourceProvider::lockForRead(ResourceId i
 #else
     Resource* resource = &it->second;
 #endif
-    ASSERT(!resource->lockedForWrite);
-    ASSERT(!resource->exported);
+    CC_DCHECK(!resource->lockedForWrite);
+    CC_DCHECK(!resource->exported);
     resource->lockForReadCount++;
     return resource;
 }
 
 void CCResourceProvider::unlockForRead(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -363,14 +363,14 @@ void CCResourceProvider::unlockForRead(ResourceId id)
 #else
     Resource* resource = &it->second;
 #endif
-    ASSERT(resource->lockForReadCount > 0);
-    ASSERT(!resource->exported);
+    CC_DCHECK(resource->lockForReadCount > 0);
+    CC_DCHECK(!resource->exported);
     resource->lockForReadCount--;
 }
 
 const CCResourceProvider::Resource* CCResourceProvider::lockForWrite(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -378,17 +378,17 @@ const CCResourceProvider::Resource* CCResourceProvider::lockForWrite(ResourceId
 #else
     Resource* resource = &it->second;
 #endif
-    ASSERT(!resource->lockedForWrite);
-    ASSERT(!resource->lockForReadCount);
-    ASSERT(!resource->exported);
-    ASSERT(!resource->external);
+    CC_DCHECK(!resource->lockedForWrite);
+    CC_DCHECK(!resource->lockForReadCount);
+    CC_DCHECK(!resource->exported);
+    CC_DCHECK(!resource->external);
     resource->lockedForWrite = true;
     return resource;
 }
 
 void CCResourceProvider::unlockForWrite(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -396,9 +396,9 @@ void CCResourceProvider::unlockForWrite(ResourceId id)
 #else
     Resource* resource = &it->second;
 #endif
-    ASSERT(resource->lockedForWrite);
-    ASSERT(!resource->exported);
-    ASSERT(!resource->external);
+    CC_DCHECK(resource->lockedForWrite);
+    CC_DCHECK(!resource->exported);
+    CC_DCHECK(!resource->external);
     resource->lockedForWrite = false;
 }
 
@@ -407,7 +407,7 @@ CCResourceProvider::ScopedReadLockGL::ScopedReadLockGL(CCResourceProvider* resou
     , m_resourceId(resourceId)
     , m_textureId(resourceProvider->lockForRead(resourceId)->glId)
 {
-    ASSERT(m_textureId);
+    CC_DCHECK(m_textureId);
 }
 
 CCResourceProvider::ScopedReadLockGL::~ScopedReadLockGL()
@@ -420,7 +420,7 @@ CCResourceProvider::ScopedWriteLockGL::ScopedWriteLockGL(CCResourceProvider* res
     , m_resourceId(resourceId)
     , m_textureId(resourceProvider->lockForWrite(resourceId)->glId)
 {
-    ASSERT(m_textureId);
+    CC_DCHECK(m_textureId);
 }
 
 CCResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
@@ -430,8 +430,8 @@ CCResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
 
 void CCResourceProvider::populateSkBitmapWithResource(SkBitmap* skBitmap, const Resource* resource)
 {
-    ASSERT(resource->pixels);
-    ASSERT(resource->format == GraphicsContext3D::RGBA);
+    CC_DCHECK(resource->pixels);
+    CC_DCHECK(resource->format == GraphicsContext3D::RGBA);
     skBitmap->setConfig(SkBitmap::kARGB_8888_Config, resource->size.width(), resource->size.height());
     skBitmap->setPixels(resource->pixels);
 }
@@ -475,7 +475,7 @@ CCResourceProvider::CCResourceProvider(CCGraphicsContext* context)
 
 bool CCResourceProvider::initialize()
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d) {
         m_maxTextureSize = INT_MAX / 2;
@@ -513,7 +513,7 @@ bool CCResourceProvider::initialize()
 
 int CCResourceProvider::createChild(int pool)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     Child childInfo;
     childInfo.pool = pool;
     int child = m_nextChild++;
@@ -523,9 +523,9 @@ int CCResourceProvider::createChild(int pool)
 
 void CCResourceProvider::destroyChild(int child)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ChildMap::iterator it = m_children.find(child);
-    ASSERT(it != m_children.end());
+    CC_DCHECK(it != m_children.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
     deleteOwnedResources(it->value.pool);
 #else
@@ -537,9 +537,9 @@ void CCResourceProvider::destroyChild(int child)
 
 const CCResourceProvider::ResourceIdMap& CCResourceProvider::getChildToParentMap(int child) const
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ChildMap::const_iterator it = m_children.find(child);
-    ASSERT(it != m_children.end());
+    CC_DCHECK(it != m_children.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
     return it->value.childToParentMap;
 #else
@@ -549,7 +549,7 @@ const CCResourceProvider::ResourceIdMap& CCResourceProvider::getChildToParentMap
 
 CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToParent(const ResourceIdArray& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     TransferableResourceList list;
     list.syncPoint = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
@@ -575,7 +575,7 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToPa
 
 CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToChild(int child, const ResourceIdArray& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     TransferableResourceList list;
     list.syncPoint = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
@@ -591,7 +591,7 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToCh
     for (ResourceIdArray::const_iterator it = resources.begin(); it != resources.end(); ++it) {
         TransferableResource resource;
         if (!transferResource(context3d, *it, &resource))
-            ASSERT_NOT_REACHED();
+            NOTREACHED();
         resource.id = childInfo.parentToChildMap.get(*it);
         childInfo.parentToChildMap.remove(*it);
         childInfo.childToParentMap.remove(resource.id);
@@ -605,7 +605,7 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToCh
 
 void CCResourceProvider::receiveFromChild(int child, const TransferableResourceList& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
@@ -641,7 +641,7 @@ void CCResourceProvider::receiveFromChild(int child, const TransferableResourceL
 
 void CCResourceProvider::receiveFromParent(const TransferableResourceList& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
@@ -651,13 +651,13 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
         GLC(context3d, context3d->waitSyncPoint(resources.syncPoint));
     for (Vector<TransferableResource>::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
         ResourceMap::iterator mapIterator = m_resources.find(it->id);
-        ASSERT(mapIterator != m_resources.end());
+        CC_DCHECK(mapIterator != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
         Resource* resource = &mapIterator->value;
 #else
         Resource* resource = &mapIterator->second;
 #endif
-        ASSERT(resource->exported);
+        CC_DCHECK(resource->exported);
         resource->exported = false;
         GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId));
         GLC(context3d, context3d->consumeTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, it->mailbox.name));
@@ -669,7 +669,7 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
 
 bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource)
 {
-    ASSERT(CCProxy::isImplThread());
+    CC_DCHECK(CCProxy::isImplThread());
     ResourceMap::const_iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 #if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
@@ -677,9 +677,9 @@ bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, Resourc
 #else
     const Resource* source = &it->second;
 #endif
-    ASSERT(!source->lockedForWrite);
-    ASSERT(!source->lockForReadCount);
-    ASSERT(!source->external);
+    CC_DCHECK(!source->lockedForWrite);
+    CC_DCHECK(!source->lockForReadCount);
+    CC_DCHECK(!source->external);
     if (source->exported)
         return false;
     resource->id = id;