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

Unified Diff: cc/CCPrioritizedTexture.cpp

Issue 11048044: cc: Switch to Chromium DCHECKs and LOGs (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
Index: cc/CCPrioritizedTexture.cpp
diff --git a/cc/CCPrioritizedTexture.cpp b/cc/CCPrioritizedTexture.cpp
index 2940e925227420bcf189cb22b1b853115003d336..4892bfd28e53f916950dedf2b9df8e3dc620fdbd 100644
--- a/cc/CCPrioritizedTexture.cpp
+++ b/cc/CCPrioritizedTexture.cpp
@@ -26,7 +26,7 @@ CCPrioritizedTexture::CCPrioritizedTexture(CCPrioritizedTextureManager* manager,
, m_manager(0)
{
// m_manager is set in registerTexture() so validity can be checked.
- ASSERT(format || size.isEmpty());
+ DCHECK(format || size.isEmpty());
if (format)
m_bytes = CCTexture::memorySizeBytes(size, format);
if (manager)
@@ -56,7 +56,7 @@ void CCPrioritizedTexture::setDimensions(IntSize size, GC3Denum format)
m_format = format;
m_size = size;
m_bytes = CCTexture::memorySizeBytes(size, format);
- ASSERT(m_manager || !m_backing);
+ DCHECK(m_manager || !m_backing);
if (m_manager)
m_manager->returnBackingTexture(this);
}
@@ -76,7 +76,7 @@ bool CCPrioritizedTexture::backingResourceWasEvicted() const
void CCPrioritizedTexture::acquireBackingTexture(CCResourceProvider* resourceProvider)
{
- ASSERT(m_isAbovePriorityCutoff);
+ DCHECK(m_isAbovePriorityCutoff);
if (m_isAbovePriorityCutoff)
m_manager->acquireBackingTextureIfNeeded(this, resourceProvider);
}
@@ -92,18 +92,18 @@ void CCPrioritizedTexture::upload(CCResourceProvider* resourceProvider,
const uint8_t* image, const IntRect& imageRect,
const IntRect& sourceRect, const IntSize& destOffset)
{
- ASSERT(m_isAbovePriorityCutoff);
+ DCHECK(m_isAbovePriorityCutoff);
if (m_isAbovePriorityCutoff)
acquireBackingTexture(resourceProvider);
- ASSERT(m_backing);
+ DCHECK(m_backing);
resourceProvider->upload(resourceId(), image, imageRect, sourceRect, destOffset);
}
void CCPrioritizedTexture::link(Backing* backing)
{
- ASSERT(backing);
- ASSERT(!backing->m_owner);
- ASSERT(!m_backing);
+ DCHECK(backing);
+ DCHECK(!backing->m_owner);
+ DCHECK(!m_backing);
m_backing = backing;
m_backing->m_owner = this;
@@ -111,8 +111,8 @@ void CCPrioritizedTexture::link(Backing* backing)
void CCPrioritizedTexture::unlink()
{
- ASSERT(m_backing);
- ASSERT(m_backing->m_owner == this);
+ DCHECK(m_backing);
+ DCHECK(m_backing->m_owner == this);
m_backing->m_owner = 0;
m_backing = 0;
@@ -132,25 +132,21 @@ CCPrioritizedTexture::Backing::Backing(unsigned id, CCResourceProvider* resource
, m_ownerExistedAtLastPriorityUpdate(false)
, m_wasAbovePriorityCutoffAtLastPriorityUpdate(false)
, m_resourceHasBeenDeleted(false)
-#ifndef NDEBUG
, m_resourceProvider(resourceProvider)
-#endif
{
}
CCPrioritizedTexture::Backing::~Backing()
{
- ASSERT(!m_owner);
- ASSERT(m_resourceHasBeenDeleted);
+ DCHECK(!m_owner);
+ DCHECK(m_resourceHasBeenDeleted);
}
void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceProvider)
{
- ASSERT(CCProxy::isImplThread());
- ASSERT(!m_resourceHasBeenDeleted);
-#ifndef NDEBUG
- ASSERT(resourceProvider == m_resourceProvider);
-#endif
+ DCHECK(CCProxy::isImplThread());
+ DCHECK(!m_resourceHasBeenDeleted);
+ DCHECK(resourceProvider == m_resourceProvider);
resourceProvider->deleteResource(id());
setId(0);
@@ -159,13 +155,14 @@ void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceP
bool CCPrioritizedTexture::Backing::resourceHasBeenDeleted() const
{
- ASSERT(CCProxy::isImplThread());
+ DCHECK(CCProxy::isImplThread());
return m_resourceHasBeenDeleted;
}
void CCPrioritizedTexture::Backing::updatePriority()
{
- ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
+ DCHECK(CCProxy::isImplThread());
+ DCHECK(CCProxy::isMainThreadBlocked());
if (m_owner) {
m_ownerExistedAtLastPriorityUpdate = true;
m_priorityAtLastPriorityUpdate = m_owner->requestPriority();

Powered by Google App Engine
This is Rietveld 408576698