| Index: cc/prioritized_texture.cc
|
| diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc
|
| index dddbe846ba08a0c4c36638ede87b058847cbe15d..ce6afcbd4530d0eb0c3d3e3182dff6cefbc4f634 100644
|
| --- a/cc/prioritized_texture.cc
|
| +++ b/cc/prioritized_texture.cc
|
| @@ -146,7 +146,7 @@ CCPrioritizedTexture::Backing::~Backing()
|
|
|
| void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceProvider)
|
| {
|
| - DCHECK(CCProxy::isImplThread());
|
| + DCHECK(resourceProvider->proxy()->isImplThread());
|
| DCHECK(!m_resourceHasBeenDeleted);
|
| #ifndef NDEBUG
|
| DCHECK(resourceProvider == m_resourceProvider);
|
| @@ -159,19 +159,19 @@ void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceP
|
|
|
| bool CCPrioritizedTexture::Backing::resourceHasBeenDeleted() const
|
| {
|
| - DCHECK(CCProxy::isImplThread());
|
| +// DCHECK(m_manager->proxy()->isImplThread());
|
| return m_resourceHasBeenDeleted;
|
| }
|
|
|
| bool CCPrioritizedTexture::Backing::canBeRecycled() const
|
| {
|
| - DCHECK(CCProxy::isImplThread());
|
| +// DCHECK(m_manager->proxy()->isImplThread());
|
| return !m_wasAbovePriorityCutoffAtLastPriorityUpdate && !m_inDrawingImplTree;
|
| }
|
|
|
| void CCPrioritizedTexture::Backing::updatePriority()
|
| {
|
| - DCHECK(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
|
| +// DCHECK(m_manager->proxy()->isImplThread() && m_manager->proxy()->isMainThreadBlocked());
|
| if (m_owner) {
|
| m_priorityAtLastPriorityUpdate = m_owner->requestPriority();
|
| m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityCutoff();
|
| @@ -183,7 +183,7 @@ void CCPrioritizedTexture::Backing::updatePriority()
|
|
|
| void CCPrioritizedTexture::Backing::updateInDrawingImplTree()
|
| {
|
| - DCHECK(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
|
| +// DCHECK(m_manager->proxy()->isImplThread() && m_manager->proxy()->isMainThreadBlocked());
|
| m_inDrawingImplTree = !!owner();
|
| if (!m_inDrawingImplTree)
|
| DCHECK(m_priorityAtLastPriorityUpdate == CCPriorityCalculator::lowestPriority());
|
|
|