Revert "cc: Switch to Chromium DCHECKs LOGs"

cc/resource_provider.cc

 // 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 "CCResourceProvider.h"
 #ifdef LOG
 #undef LOG
 #endif
@@ skipping 21 matching lines @@
 static GC3Denum textureToStorageFormat(GC3Denum textureFormat)
 {
     GC3Denum storageFormat = Extensions3D::RGBA8_OES;
     switch (textureFormat) {
     case GraphicsContext3D::RGBA:
         break;
     case Extensions3D::BGRA_EXT:
         storageFormat = Extensions3DChromium::BGRA8_EXT;
         break;
     default:
-        NOTREACHED();
+        ASSERT_NOT_REACHED();
         break;
     }
 
     return storageFormat;
 }
 
 static bool isTextureFormatSupportedForStorage(GC3Denum format)
 {
     return (format == GraphicsContext3D::RGBA || format == Extensions3D::BGRA_EXT);
 }
@@ skipping 71 matching lines @@
 {
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent())
         return;
     m_textureUploader.clear();
     m_textureCopier.clear();
 }
 
 WebGraphicsContext3D* CCResourceProvider::graphicsContext3D()
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     return m_context->context3D();
 }
 
 bool CCResourceProvider::inUseByConsumer(ResourceId id)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
     return !!resource->lockForReadCount || resource->exported;
 }
 
 CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
 {
     switch (m_defaultResourceType) {
     case GLTexture:
         return createGLTexture(pool, size, format, hint);
     case Bitmap:
-        DCHECK(format == GraphicsContext3D::RGBA);
+        ASSERT(format == GraphicsContext3D::RGBA);
         return createBitmap(pool, size);
     }
 
     CRASH();
     return 0;
 }
 
 CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     unsigned textureId = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
-    DCHECK(context3d);
+    ASSERT(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));
     GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
     GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE));
     GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE));
 
     if (m_useTextureUsageHint && hint == TextureUsageFramebuffer)
         GLC(context3d, context3d->texParameteri(GraphicsContext3D::TEXTURE_2D, Extensions3DChromium::GL_TEXTURE_USAGE_ANGLE, Extensions3DChromium::GL_FRAMEBUFFER_ATTACHMENT_ANGLE));
     if (m_useTextureStorageExt && isTextureFormatSupportedForStorage(format)) {
         GC3Denum storageFormat = textureToStorageFormat(format);
         GLC(context3d, context3d->texStorage2DEXT(GraphicsContext3D::TEXTURE_2D, 1, storageFormat, size.width(), size.height()));
     } else
         GLC(context3d, context3d->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, format, size.width(), size.height(), 0, format, GraphicsContext3D::UNSIGNED_BYTE, 0));
     ResourceId id = m_nextId++;
     Resource resource(textureId, pool, size, format);
     m_resources[id] = resource;
     return id;
 }
 
 CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const IntSize& size)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
 
     uint8_t* pixels = new uint8_t[size.width() * size.height() * 4];
 
     ResourceId id = m_nextId++;
     Resource resource(pixels, pool, size, GraphicsContext3D::RGBA);
     m_resources[id] = resource;
     return id;
 }
 
 CCResourceProvider::ResourceId CCResourceProvider::createResourceFromExternalTexture(unsigned textureId)
 {
-    DCHECK(CCProxy::isImplThread());
-    DCHECK(m_context->context3D());
+    ASSERT(CCProxy::isImplThread());
+    ASSERT(m_context->context3D());
     ResourceId id = m_nextId++;
     Resource resource(textureId, 0, IntSize(), 0);
     resource.external = true;
     m_resources[id] = resource;
     return id;
 }
 
 void CCResourceProvider::deleteResource(ResourceId id)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
-    DCHECK(!resource->lockedForWrite);
-    DCHECK(!resource->lockForReadCount);
-    DCHECK(!resource->markedForDeletion);
+    ASSERT(!resource->lockedForWrite);
+    ASSERT(!resource->lockForReadCount);
+    ASSERT(!resource->markedForDeletion);
 
     if (resource->exported) {
         resource->markedForDeletion = true;
         return;
     } else
         deleteResourceInternal(it);
 }
 
 void CCResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
 {
     Resource* resource = &it->second;
     if (resource->glId && !resource->external) {
         WebGraphicsContext3D* context3d = m_context->context3D();
-        DCHECK(context3d);
+        ASSERT(context3d);
         GLC(context3d, context3d->deleteTexture(resource->glId));
     }
     if (resource->pixels)
         delete resource->pixels;
 
     m_resources.erase(it);
 }
 
 void CCResourceProvider::deleteOwnedResources(int pool)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceIdArray toDelete;
     for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
         if (it->second.pool == pool && !it->second.external && !it->second.markedForDeletion)
             toDelete.append(it->first);
     }
     for (ResourceIdArray::iterator it = toDelete.begin(); it != toDelete.end(); ++it)
         deleteResource(*it);
 }
 
 CCResourceProvider::ResourceType CCResourceProvider::resourceType(ResourceId id)
 {
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
     return resource->type;
 }
 
 void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRect& imageRect, const IntRect& sourceRect, const IntSize& destOffset)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
-    DCHECK(!resource->lockedForWrite);
-    DCHECK(!resource->lockForReadCount);
-    DCHECK(!resource->external);
-    DCHECK(!resource->exported);
+    ASSERT(!resource->lockedForWrite);
+    ASSERT(!resource->lockForReadCount);
+    ASSERT(!resource->external);
+    ASSERT(!resource->exported);
 
     if (resource->glId) {
         WebGraphicsContext3D* context3d = m_context->context3D();
-        DCHECK(context3d);
-        DCHECK(m_texSubImage.get());
+        ASSERT(context3d);
+        ASSERT(m_texSubImage.get());
         context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId);
         m_texSubImage->upload(image, imageRect, sourceRect, destOffset, resource->format, context3d);
     }
 
     if (resource->pixels) {
         SkBitmap srcFull;
         srcFull.setConfig(SkBitmap::kARGB_8888_Config, imageRect.width(), imageRect.height());
         srcFull.setPixels(const_cast<uint8_t*>(image));
         SkBitmap srcSubset;
         SkIRect skSourceRect = SkIRect::MakeXYWH(sourceRect.x(), sourceRect.y(), sourceRect.width(), sourceRect.height());
         skSourceRect.offset(-imageRect.x(), -imageRect.y());
         srcFull.extractSubset(&srcSubset, skSourceRect);
 
         ScopedWriteLockSoftware lock(this, id);
         SkCanvas* dest = lock.skCanvas();
         dest->writePixels(srcSubset, destOffset.width(), destOffset.height());
     }
 }
 
 void CCResourceProvider::flush()
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (context3d)
         context3d->flush();
 }
 
 bool CCResourceProvider::shallowFlushIfSupported()
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !m_useShallowFlush)
         return false;
 
     context3d->shallowFlushCHROMIUM();
     return true;
 }
 
 const CCResourceProvider::Resource* CCResourceProvider::lockForRead(ResourceId id)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 
     Resource* resource = &it->second;
-    DCHECK(!resource->lockedForWrite);
-    DCHECK(!resource->exported);
+    ASSERT(!resource->lockedForWrite);
+    ASSERT(!resource->exported);
     resource->lockForReadCount++;
     return resource;
 }
 
 void CCResourceProvider::unlockForRead(ResourceId id)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
-    DCHECK(resource->lockForReadCount > 0);
-    DCHECK(!resource->exported);
+    ASSERT(resource->lockForReadCount > 0);
+    ASSERT(!resource->exported);
     resource->lockForReadCount--;
 }
 
 const CCResourceProvider::Resource* CCResourceProvider::lockForWrite(ResourceId id)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
-    DCHECK(!resource->lockedForWrite);
-    DCHECK(!resource->lockForReadCount);
-    DCHECK(!resource->exported);
-    DCHECK(!resource->external);
+    ASSERT(!resource->lockedForWrite);
+    ASSERT(!resource->lockForReadCount);
+    ASSERT(!resource->exported);
+    ASSERT(!resource->external);
     resource->lockedForWrite = true;
     return resource;
 }
 
 void CCResourceProvider::unlockForWrite(ResourceId id)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
-    DCHECK(resource->lockedForWrite);
-    DCHECK(!resource->exported);
-    DCHECK(!resource->external);
+    ASSERT(resource->lockedForWrite);
+    ASSERT(!resource->exported);
+    ASSERT(!resource->external);
     resource->lockedForWrite = false;
 }
 
 CCResourceProvider::ScopedReadLockGL::ScopedReadLockGL(CCResourceProvider* resourceProvider, CCResourceProvider::ResourceId resourceId)
     : m_resourceProvider(resourceProvider)
     , m_resourceId(resourceId)
     , m_textureId(resourceProvider->lockForRead(resourceId)->glId)
 {
-    DCHECK(m_textureId);
+    ASSERT(m_textureId);
 }
 
 CCResourceProvider::ScopedReadLockGL::~ScopedReadLockGL()
 {
     m_resourceProvider->unlockForRead(m_resourceId);
 }
 
 CCResourceProvider::ScopedWriteLockGL::ScopedWriteLockGL(CCResourceProvider* resourceProvider, CCResourceProvider::ResourceId resourceId)
     : m_resourceProvider(resourceProvider)
     , m_resourceId(resourceId)
     , m_textureId(resourceProvider->lockForWrite(resourceId)->glId)
 {
-    DCHECK(m_textureId);
+    ASSERT(m_textureId);
 }
 
 CCResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
 {
     m_resourceProvider->unlockForWrite(m_resourceId);
 }
 
 void CCResourceProvider::populateSkBitmapWithResource(SkBitmap* skBitmap, const Resource* resource)
 {
-    DCHECK(resource->pixels);
-    DCHECK(resource->format == GraphicsContext3D::RGBA);
+    ASSERT(resource->pixels);
+    ASSERT(resource->format == GraphicsContext3D::RGBA);
     skBitmap->setConfig(SkBitmap::kARGB_8888_Config, resource->size.width(), resource->size.height());
     skBitmap->setPixels(resource->pixels);
 }
 
 CCResourceProvider::ScopedReadLockSoftware::ScopedReadLockSoftware(CCResourceProvider* resourceProvider, CCResourceProvider::ResourceId resourceId)
     : m_resourceProvider(resourceProvider)
     , m_resourceId(resourceId)
 {
     CCResourceProvider::populateSkBitmapWithResource(&m_skBitmap, resourceProvider->lockForRead(resourceId));
 }
@@ skipping 23 matching lines @@
     , m_defaultResourceType(GLTexture)
     , m_useTextureStorageExt(false)
     , m_useTextureUsageHint(false)
     , m_useShallowFlush(false)
     , m_maxTextureSize(0)
 {
 }
 
 bool CCResourceProvider::initialize()
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d) {
         m_maxTextureSize = INT_MAX / 2;
         m_textureUploader = UnthrottledTextureUploader::create();
         return true;
     }
     if (!context3d->makeContextCurrent())
         return false;
 
     std::string extensionsString = UTF16ToASCII(context3d->getString(GraphicsContext3D::EXTENSIONS));
@@ skipping 17 matching lines @@
     m_texSubImage = adoptPtr(new LayerTextureSubImage(useMapSub));
     m_textureCopier = AcceleratedTextureCopier::create(context3d, useBindUniform);
 
     m_textureUploader = ThrottledTextureUploader::create(context3d);
     GLC(context3d, context3d->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_maxTextureSize));
     return true;
 }
 
 int CCResourceProvider::createChild(int pool)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     Child childInfo;
     childInfo.pool = pool;
     int child = m_nextChild++;
     m_children[child] = childInfo;
     return child;
 }
 
 void CCResourceProvider::destroyChild(int child)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ChildMap::iterator it = m_children.find(child);
-    DCHECK(it != m_children.end());
+    ASSERT(it != m_children.end());
     deleteOwnedResources(it->second.pool);
     m_children.erase(it);
     trimMailboxDeque();
 }
 
 const CCResourceProvider::ResourceIdMap& CCResourceProvider::getChildToParentMap(int child) const
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ChildMap::const_iterator it = m_children.find(child);
-    DCHECK(it != m_children.end());
+    ASSERT(it != m_children.end());
     return it->second.childToParentMap;
 }
 
 CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToParent(const ResourceIdArray& resources)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     TransferableResourceList list;
     list.syncPoint = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return list;
     }
     for (ResourceIdArray::const_iterator it = resources.begin(); it != resources.end(); ++it) {
         TransferableResource resource;
         if (transferResource(context3d, *it, &resource)) {
             m_resources.find(*it)->second.exported = true;
             list.resources.append(resource);
         }
     }
     if (list.resources.size())
         list.syncPoint = context3d->insertSyncPoint();
     return list;
 }
 
 CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToChild(int child, const ResourceIdArray& resources)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     TransferableResourceList list;
     list.syncPoint = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return list;
     }
     Child& childInfo = m_children.find(child)->second;
     for (ResourceIdArray::const_iterator it = resources.begin(); it != resources.end(); ++it) {
         TransferableResource resource;
         if (!transferResource(context3d, *it, &resource))
-            NOTREACHED();
-        DCHECK(childInfo.parentToChildMap.find(*it) != childInfo.parentToChildMap.end());
+            ASSERT_NOT_REACHED();
+        ASSERT(childInfo.parentToChildMap.find(*it) != childInfo.parentToChildMap.end());
         resource.id = childInfo.parentToChildMap[*it];
         childInfo.parentToChildMap.erase(*it);
         childInfo.childToParentMap.erase(resource.id);
         list.resources.append(resource);
         deleteResource(*it);
     }
     if (list.resources.size())
         list.syncPoint = context3d->insertSyncPoint();
     return list;
 }
 
 void CCResourceProvider::receiveFromChild(int child, const TransferableResourceList& resources)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return;
     }
     if (resources.syncPoint) {
         // NOTE: If the parent is a browser and the child a renderer, the parent
         // is not supposed to have its context wait, because that could induce
         // deadlocks and/or security issues. The caller is responsible for
         // waiting asynchronously, and resetting syncPoint before calling this.
@@ skipping 11 matching lines @@
         Resource resource(textureId, childInfo.pool, it->size, it->format);
         m_resources[id] = resource;
         m_mailboxes.append(it->mailbox);
         childInfo.parentToChildMap[id] = it->id;
         childInfo.childToParentMap[it->id] = id;
     }
 }
 
 void CCResourceProvider::receiveFromParent(const TransferableResourceList& resources)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
         return;
     }
     if (resources.syncPoint)
         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);
-        DCHECK(mapIterator != m_resources.end());
+        ASSERT(mapIterator != m_resources.end());
         Resource* resource = &mapIterator->second;
-        DCHECK(resource->exported);
+        ASSERT(resource->exported);
         resource->exported = false;
         GLC(context3d, context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId));
         GLC(context3d, context3d->consumeTextureCHROMIUM(GraphicsContext3D::TEXTURE_2D, it->mailbox.name));
         m_mailboxes.append(it->mailbox);
         if (resource->markedForDeletion)
             deleteResourceInternal(mapIterator);
     }
 }
 
 bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource)
 {
-    DCHECK(CCProxy::isImplThread());
+    ASSERT(CCProxy::isImplThread());
     ResourceMap::const_iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     const Resource* source = &it->second;
-    DCHECK(!source->lockedForWrite);
-    DCHECK(!source->lockForReadCount);
-    DCHECK(!source->external);
+    ASSERT(!source->lockedForWrite);
+    ASSERT(!source->lockForReadCount);
+    ASSERT(!source->external);
     if (source->exported)
         return false;
     resource->id = id;
     resource->format = source->format;
     resource->size = source->size;
     if (!m_mailboxes.isEmpty())
         resource->mailbox = m_mailboxes.takeFirst();
     else
         GLC(context, context->genMailboxCHROMIUM(resource->mailbox.name));
     GLC(context, context->bindTexture(GraphicsContext3D::TEXTURE_2D, source->glId));
@@ skipping 21 matching lines @@
         for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
             if (ContainsKey(childPoolSet, it->second.pool))
                 ++maxMailboxCount;
         }
     }
     while (m_mailboxes.size() > maxMailboxCount)
         m_mailboxes.removeFirst();
 }
 
 }