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

Unified Diff: cc/prioritized_texture.cc

Issue 11369071: A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/prioritized_texture.h ('k') | cc/prioritized_texture_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/prioritized_texture.cc
===================================================================
--- cc/prioritized_texture.cc (revision 165906)
+++ cc/prioritized_texture.cc (working copy)
@@ -153,7 +153,7 @@
void PrioritizedTexture::Backing::deleteResource(ResourceProvider* resourceProvider)
{
- DCHECK(!proxy() || proxy()->isImplThread());
+ DCHECK(Proxy::isImplThread());
DCHECK(!m_resourceHasBeenDeleted);
#ifndef NDEBUG
DCHECK(resourceProvider == m_resourceProvider);
@@ -166,19 +166,19 @@
bool PrioritizedTexture::Backing::resourceHasBeenDeleted() const
{
- DCHECK(!proxy() || proxy()->isImplThread());
+ DCHECK(Proxy::isImplThread());
return m_resourceHasBeenDeleted;
}
bool PrioritizedTexture::Backing::canBeRecycled() const
{
- DCHECK(!proxy() || proxy()->isImplThread());
+ DCHECK(Proxy::isImplThread());
return !m_wasAbovePriorityCutoffAtLastPriorityUpdate && !m_inDrawingImplTree;
}
void PrioritizedTexture::Backing::updatePriority()
{
- DCHECK(!proxy() || proxy()->isImplThread() && proxy()->isMainThreadBlocked());
+ DCHECK(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
if (m_owner) {
m_priorityAtLastPriorityUpdate = m_owner->requestPriority();
m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityCutoff();
@@ -190,7 +190,7 @@
void PrioritizedTexture::Backing::updateInDrawingImplTree()
{
- DCHECK(!proxy() || proxy()->isImplThread() && proxy()->isMainThreadBlocked());
+ DCHECK(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
m_inDrawingImplTree = !!owner();
if (!m_inDrawingImplTree)
DCHECK(m_priorityAtLastPriorityUpdate == PriorityCalculator::lowestPriority());
@@ -203,11 +203,4 @@
m_manager->returnBackingTexture(this);
}
-const Proxy* PrioritizedTexture::Backing::proxy() const
-{
- if (!m_owner || !m_owner->textureManager())
- return 0;
- return m_owner->textureManager()->proxyForDebug();
-}
-
} // namespace cc
« no previous file with comments | « cc/prioritized_texture.h ('k') | cc/prioritized_texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698