Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resource_provider.cc

Issue 11192030: cc: Switch to Chromium DCHECKs LOGs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebaseonenne Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/render_surface_impl.cc ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resource_provider.cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index da5f396c0e280215df0b21cb8dffe84bcb49ff33..c6e7882a6be965636d28e6f7f67ed4a70e08b246 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -36,7 +36,7 @@ static GC3Denum textureToStorageFormat(GC3Denum textureFormat)
storageFormat = Extensions3DChromium::BGRA8_EXT;
break;
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
break;
}
@@ -128,13 +128,13 @@ CCResourceProvider::~CCResourceProvider()
WebGraphicsContext3D* CCResourceProvider::graphicsContext3D()
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
return m_context->context3D();
}
bool CCResourceProvider::inUseByConsumer(ResourceId id)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* resource = &it->second;
@@ -147,7 +147,7 @@ CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, cons
case GLTexture:
return createGLTexture(pool, size, format, hint);
case Bitmap:
- ASSERT(format == GraphicsContext3D::RGBA);
+ DCHECK(format == GraphicsContext3D::RGBA);
return createBitmap(pool, size);
}
@@ -157,10 +157,10 @@ CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, cons
CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
unsigned textureId = 0;
WebGraphicsContext3D* context3d = m_context->context3D();
- ASSERT(context3d);
+ 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));
@@ -183,7 +183,7 @@ CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, con
CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const IntSize& size)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
uint8_t* pixels = new uint8_t[size.width() * size.height() * 4];
@@ -195,8 +195,8 @@ CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const
CCResourceProvider::ResourceId CCResourceProvider::createResourceFromExternalTexture(unsigned textureId)
{
- ASSERT(CCProxy::isImplThread());
- ASSERT(m_context->context3D());
+ DCHECK(CCProxy::isImplThread());
+ DCHECK(m_context->context3D());
ResourceId id = m_nextId++;
Resource resource(textureId, 0, IntSize(), 0);
resource.external = true;
@@ -206,13 +206,13 @@ CCResourceProvider::ResourceId CCResourceProvider::createResourceFromExternalTex
void CCResourceProvider::deleteResource(ResourceId id)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* resource = &it->second;
- ASSERT(!resource->lockedForWrite);
- ASSERT(!resource->lockForReadCount);
- ASSERT(!resource->markedForDeletion);
+ DCHECK(!resource->lockedForWrite);
+ DCHECK(!resource->lockForReadCount);
+ DCHECK(!resource->markedForDeletion);
if (resource->exported) {
resource->markedForDeletion = true;
@@ -226,7 +226,7 @@ void CCResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
Resource* resource = &it->second;
if (resource->glId && !resource->external) {
WebGraphicsContext3D* context3d = m_context->context3D();
- ASSERT(context3d);
+ DCHECK(context3d);
GLC(context3d, context3d->deleteTexture(resource->glId));
}
if (resource->pixels)
@@ -237,7 +237,7 @@ void CCResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
void CCResourceProvider::deleteOwnedResources(int pool)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(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)
@@ -257,19 +257,19 @@ 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());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* resource = &it->second;
- ASSERT(!resource->lockedForWrite);
- ASSERT(!resource->lockForReadCount);
- ASSERT(!resource->external);
- ASSERT(!resource->exported);
+ DCHECK(!resource->lockedForWrite);
+ DCHECK(!resource->lockForReadCount);
+ DCHECK(!resource->external);
+ DCHECK(!resource->exported);
if (resource->glId) {
WebGraphicsContext3D* context3d = m_context->context3D();
- ASSERT(context3d);
- ASSERT(m_texSubImage.get());
+ DCHECK(context3d);
+ DCHECK(m_texSubImage.get());
context3d->bindTexture(GraphicsContext3D::TEXTURE_2D, resource->glId);
m_texSubImage->upload(image, imageRect, sourceRect, destOffset, resource->format, context3d);
}
@@ -291,7 +291,7 @@ void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRe
void CCResourceProvider::flush()
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
WebGraphicsContext3D* context3d = m_context->context3D();
if (context3d)
context3d->flush();
@@ -299,7 +299,7 @@ void CCResourceProvider::flush()
bool CCResourceProvider::shallowFlushIfSupported()
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
WebGraphicsContext3D* context3d = m_context->context3D();
if (!context3d || !m_useShallowFlush)
return false;
@@ -310,51 +310,51 @@ bool CCResourceProvider::shallowFlushIfSupported()
const CCResourceProvider::Resource* CCResourceProvider::lockForRead(ResourceId id)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* resource = &it->second;
- ASSERT(!resource->lockedForWrite);
- ASSERT(!resource->exported);
+ DCHECK(!resource->lockedForWrite);
+ DCHECK(!resource->exported);
resource->lockForReadCount++;
return resource;
}
void CCResourceProvider::unlockForRead(ResourceId id)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* resource = &it->second;
- ASSERT(resource->lockForReadCount > 0);
- ASSERT(!resource->exported);
+ DCHECK(resource->lockForReadCount > 0);
+ DCHECK(!resource->exported);
resource->lockForReadCount--;
}
const CCResourceProvider::Resource* CCResourceProvider::lockForWrite(ResourceId id)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* resource = &it->second;
- ASSERT(!resource->lockedForWrite);
- ASSERT(!resource->lockForReadCount);
- ASSERT(!resource->exported);
- ASSERT(!resource->external);
+ DCHECK(!resource->lockedForWrite);
+ DCHECK(!resource->lockForReadCount);
+ DCHECK(!resource->exported);
+ DCHECK(!resource->external);
resource->lockedForWrite = true;
return resource;
}
void CCResourceProvider::unlockForWrite(ResourceId id)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
Resource* resource = &it->second;
- ASSERT(resource->lockedForWrite);
- ASSERT(!resource->exported);
- ASSERT(!resource->external);
+ DCHECK(resource->lockedForWrite);
+ DCHECK(!resource->exported);
+ DCHECK(!resource->external);
resource->lockedForWrite = false;
}
@@ -363,7 +363,7 @@ CCResourceProvider::ScopedReadLockGL::ScopedReadLockGL(CCResourceProvider* resou
, m_resourceId(resourceId)
, m_textureId(resourceProvider->lockForRead(resourceId)->glId)
{
- ASSERT(m_textureId);
+ DCHECK(m_textureId);
}
CCResourceProvider::ScopedReadLockGL::~ScopedReadLockGL()
@@ -376,7 +376,7 @@ CCResourceProvider::ScopedWriteLockGL::ScopedWriteLockGL(CCResourceProvider* res
, m_resourceId(resourceId)
, m_textureId(resourceProvider->lockForWrite(resourceId)->glId)
{
- ASSERT(m_textureId);
+ DCHECK(m_textureId);
}
CCResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
@@ -386,8 +386,8 @@ CCResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
void CCResourceProvider::populateSkBitmapWithResource(SkBitmap* skBitmap, const Resource* resource)
{
- ASSERT(resource->pixels);
- ASSERT(resource->format == GraphicsContext3D::RGBA);
+ DCHECK(resource->pixels);
+ DCHECK(resource->format == GraphicsContext3D::RGBA);
skBitmap->setConfig(SkBitmap::kARGB_8888_Config, resource->size.width(), resource->size.height());
skBitmap->setPixels(resource->pixels);
}
@@ -431,7 +431,7 @@ CCResourceProvider::CCResourceProvider(CCGraphicsContext* context)
bool CCResourceProvider::initialize()
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
WebGraphicsContext3D* context3d = m_context->context3D();
if (!context3d) {
m_maxTextureSize = INT_MAX / 2;
@@ -469,7 +469,7 @@ bool CCResourceProvider::initialize()
int CCResourceProvider::createChild(int pool)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
Child childInfo;
childInfo.pool = pool;
int child = m_nextChild++;
@@ -479,9 +479,9 @@ int CCResourceProvider::createChild(int pool)
void CCResourceProvider::destroyChild(int child)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ChildMap::iterator it = m_children.find(child);
- ASSERT(it != m_children.end());
+ DCHECK(it != m_children.end());
deleteOwnedResources(it->second.pool);
m_children.erase(it);
trimMailboxDeque();
@@ -489,15 +489,15 @@ void CCResourceProvider::destroyChild(int child)
const CCResourceProvider::ResourceIdMap& CCResourceProvider::getChildToParentMap(int child) const
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ChildMap::const_iterator it = m_children.find(child);
- ASSERT(it != m_children.end());
+ DCHECK(it != m_children.end());
return it->second.childToParentMap;
}
CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToParent(const ResourceIdArray& resources)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
TransferableResourceList list;
list.syncPoint = 0;
WebGraphicsContext3D* context3d = m_context->context3D();
@@ -519,7 +519,7 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToPa
CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToChild(int child, const ResourceIdArray& resources)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
TransferableResourceList list;
list.syncPoint = 0;
WebGraphicsContext3D* context3d = m_context->context3D();
@@ -531,8 +531,8 @@ 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();
- ASSERT(childInfo.parentToChildMap.find(*it) != childInfo.parentToChildMap.end());
+ NOTREACHED();
+ DCHECK(childInfo.parentToChildMap.find(*it) != childInfo.parentToChildMap.end());
resource.id = childInfo.parentToChildMap[*it];
childInfo.parentToChildMap.erase(*it);
childInfo.childToParentMap.erase(resource.id);
@@ -546,7 +546,7 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToCh
void CCResourceProvider::receiveFromChild(int child, const TransferableResourceList& resources)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
WebGraphicsContext3D* context3d = m_context->context3D();
if (!context3d || !context3d->makeContextCurrent()) {
// FIXME: Implement this path for software compositing.
@@ -578,7 +578,7 @@ void CCResourceProvider::receiveFromChild(int child, const TransferableResourceL
void CCResourceProvider::receiveFromParent(const TransferableResourceList& resources)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
WebGraphicsContext3D* context3d = m_context->context3D();
if (!context3d || !context3d->makeContextCurrent()) {
// FIXME: Implement this path for software compositing.
@@ -588,9 +588,9 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
GLC(context3d, context3d->waitSyncPoint(resources.syncPoint));
for (TransferableResourceArray::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
ResourceMap::iterator mapIterator = m_resources.find(it->id);
- ASSERT(mapIterator != m_resources.end());
+ DCHECK(mapIterator != m_resources.end());
Resource* resource = &mapIterator->second;
- ASSERT(resource->exported);
+ 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));
@@ -602,13 +602,13 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource)
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
ResourceMap::const_iterator it = m_resources.find(id);
CHECK(it != m_resources.end());
const Resource* source = &it->second;
- ASSERT(!source->lockedForWrite);
- ASSERT(!source->lockForReadCount);
- ASSERT(!source->external);
+ DCHECK(!source->lockedForWrite);
+ DCHECK(!source->lockForReadCount);
+ DCHECK(!source->external);
if (source->exported)
return false;
resource->id = id;
« no previous file with comments | « cc/render_surface_impl.cc ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698