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

Unified Diff: cc/prioritized_texture.cc

Issue 11232051: Remove static thread pointers from CC (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/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());

Powered by Google App Engine
This is Rietveld 408576698