| Index: cc/prioritized_texture.cc
|
| diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc
|
| index 37ad64fedf8c11781c3fc2e36390e75c017168ca..ed9ca0656931947e358c2d2bf96300ec067f1c07 100644
|
| --- a/cc/prioritized_texture.cc
|
| +++ b/cc/prioritized_texture.cc
|
| @@ -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;
|
| @@ -140,16 +140,16 @@ CCPrioritizedTexture::Backing::Backing(unsigned id, CCResourceProvider* resource
|
|
|
| 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);
|
| + DCHECK(CCProxy::isImplThread());
|
| + DCHECK(!m_resourceHasBeenDeleted);
|
| #ifndef NDEBUG
|
| - ASSERT(resourceProvider == m_resourceProvider);
|
| + DCHECK(resourceProvider == m_resourceProvider);
|
| #endif
|
|
|
| resourceProvider->deleteResource(id());
|
| @@ -159,19 +159,19 @@ void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceP
|
|
|
| bool CCPrioritizedTexture::Backing::resourceHasBeenDeleted() const
|
| {
|
| - ASSERT(CCProxy::isImplThread());
|
| + DCHECK(CCProxy::isImplThread());
|
| return m_resourceHasBeenDeleted;
|
| }
|
|
|
| bool CCPrioritizedTexture::Backing::canBeRecycled() const
|
| {
|
| - ASSERT(CCProxy::isImplThread());
|
| + DCHECK(CCProxy::isImplThread());
|
| return !m_wasAbovePriorityCutoffAtLastPriorityUpdate && !m_inDrawingImplTree;
|
| }
|
|
|
| void CCPrioritizedTexture::Backing::updatePriority()
|
| {
|
| - ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
|
| + DCHECK(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
|
| if (m_owner) {
|
| m_priorityAtLastPriorityUpdate = m_owner->requestPriority();
|
| m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityCutoff();
|
| @@ -183,10 +183,10 @@ void CCPrioritizedTexture::Backing::updatePriority()
|
|
|
| void CCPrioritizedTexture::Backing::updateInDrawingImplTree()
|
| {
|
| - ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
|
| + DCHECK(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
|
| m_inDrawingImplTree = !!owner();
|
| if (!m_inDrawingImplTree)
|
| - ASSERT(m_priorityAtLastPriorityUpdate == CCPriorityCalculator::lowestPriority());
|
| + DCHECK(m_priorityAtLastPriorityUpdate == CCPriorityCalculator::lowestPriority());
|
| }
|
|
|
| } // namespace cc
|
|
|