cc/prioritized_texture_manager.cc - Issue 11195015: Remove use of wtf/ListHashSet from CCPrioritizedTextureManager.

Unified Diff: cc/prioritized_texture_manager.cc

Issue 11195015: Remove use of wtf/ListHashSet from CCPrioritizedTextureManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Incorporate review feedback 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_manager.cc

diff --git a/cc/prioritized_texture_manager.cc b/cc/prioritized_texture_manager.cc

index 06d6c8e8fced4eded97301a9bcc5e57c372ca4ff..d749ba7c7af74225855c1bbd0f1e119eb8f7b18c 100644

--- a/cc/prioritized_texture_manager.cc

+++ b/cc/prioritized_texture_manager.cc

@@ -32,10 +32,10 @@ CCPrioritizedTextureManager::~CCPrioritizedTextureManager()

unregisterTexture(*m_textures.begin());

deleteUnlinkedEvictedBackings();

- ASSERT(m_evictedBackings.isEmpty());

+ ASSERT(m_evictedBackings.empty());

// Each remaining backing is a leaked opengl texture. There should be none.

- ASSERT(m_backings.isEmpty());

+ ASSERT(m_backings.empty());

}

void CCPrioritizedTextureManager::prioritizeTextures()

@@ -103,10 +103,11 @@ void CCPrioritizedTextureManager::pushTexturePrioritiesToBackings()

TRACE_EVENT0("cc", "CCPrioritizedTextureManager::pushTexturePrioritiesToBackings");

ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());

- for (BackingSet::iterator it = m_backings.begin(); it != m_backings.end(); ++it)

+ assertInvariants();

+ for (BackingList::iterator it = m_backings.begin(); it != m_backings.end(); ++it)

(*it)->updatePriority();

sortBackings();

+ assertInvariants();

}

void CCPrioritizedTextureManager::updateBackingsInDrawingImplTree()

@@ -114,35 +115,22 @@ void CCPrioritizedTextureManager::updateBackingsInDrawingImplTree()

TRACE_EVENT0("cc", "CCPrioritizedTextureManager::updateBackingsInDrawingImplTree");

ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());

- for (BackingSet::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

+ assertInvariants();

+ for (BackingList::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

CCPrioritizedTexture::Backing* backing = (*it);

backing->updateInDrawingImplTree();

}

sortBackings();

+ assertInvariants();

}

void CCPrioritizedTextureManager::sortBackings()

{

- TRACE_EVENT0("cc", "CCPrioritizedTextureManager::updateBackingsPriorities");

- ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());

- // Update backings' priorities and put backings in eviction/recycling order.

- BackingVector& sortedBackings = m_tempBackingVector;

- sortedBackings.clear();

- for (BackingSet::iterator it = m_backings.begin(); it != m_backings.end(); ++it)

- sortedBackings.append(*it);

- std::sort(sortedBackings.begin(), sortedBackings.end(), compareBackings);

- for (BackingVector::iterator it = sortedBackings.begin(); it != sortedBackings.end(); ++it) {

- m_backings.remove(*it);

- m_backings.add(*it);

- }

- sortedBackings.clear();

+ TRACE_EVENT0("cc", "CCPrioritizedTextureManager::sortBackings");

+ ASSERT(CCProxy::isImplThread());

-#if !ASSERT_DISABLED

- assertInvariants();

-#endif

+ // Put backings in eviction/recycling order.

+ m_backings.sort(compareBackings);

}

void CCPrioritizedTextureManager::clearPriorities()

@@ -189,11 +177,12 @@ void CCPrioritizedTextureManager::acquireBackingTextureIfNeeded(CCPrioritizedTex

CCPrioritizedTexture::Backing* backing = 0;

// First try to recycle

- for (BackingSet::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

+ for (BackingList::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

if (!(*it)->canBeRecycled())

break;

if ((*it)->size() == texture->size() && (*it)->format() == texture->format()) {

backing = (*it);

+ m_backings.erase(it);

break;

}

@@ -208,8 +197,7 @@ void CCPrioritizedTextureManager::acquireBackingTextureIfNeeded(CCPrioritizedTex

if (backing->owner())

backing->owner()->unlink();

texture->link(backing);

- m_backings.remove(backing);

- m_backings.add(backing);

+ m_backings.push_back(backing);

// Update the backing's priority from its new owner.

backing->updatePriority();

@@ -224,11 +212,11 @@ void CCPrioritizedTextureManager::evictBackingsToReduceMemory(size_t limitBytes,

// Destroy backings until we are below the limit,

// or until all backings remaining are above the cutoff.

while (memoryUseBytes() > limitBytes && m_backings.size() > 0) {

- CCPrioritizedTexture::Backing* backing = *m_backings.begin();

+ CCPrioritizedTexture::Backing* backing = m_backings.front();

if (evictionPolicy == RespectManagerPriorityCutoff)

if (backing->wasAbovePriorityCutoffAtLastPriorityUpdate())

break;

- evictBackingResource(backing, resourceProvider);

+ evictFirstBackingResource(resourceProvider);

}

@@ -245,7 +233,7 @@ void CCPrioritizedTextureManager::reduceMemory(CCResourceProvider* resourceProvi

// limit externally, but until then this just does some "clean up" of unused

// backing textures (any more than 10%).

size_t wastedMemory = 0;

- for (BackingSet::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

+ for (BackingList::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

if ((*it)->owner())

break;

wastedMemory += (*it)->bytes();

@@ -255,7 +243,7 @@ void CCPrioritizedTextureManager::reduceMemory(CCResourceProvider* resourceProvi

evictBackingsToReduceMemory(memoryUseBytes() - (wastedMemory - tenPercentOfMemory), RespectManagerPriorityCutoff, resourceProvider);

// Unlink all evicted backings

- for (BackingVector::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {

+ for (BackingList::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {

if ((*it)->owner())

(*it)->owner()->unlink();

}

@@ -275,20 +263,23 @@ void CCPrioritizedTextureManager::reduceMemoryOnImplThread(size_t limitBytes, CC

{

ASSERT(CCProxy::isImplThread());

ASSERT(resourceProvider);

+ // If we are in the process of uploading a new frame then the backings at the very end of

+ // the list are not sorted by priority. Sort them before doing the eviction.

+ sortBackings();

jamesr 2012/10/17 02:20:59 This will be unnecessary a lot of the time, won't

evictBackingsToReduceMemory(limitBytes, DoNotRespectManagerPriorityCutoff, resourceProvider);

}

-void CCPrioritizedTextureManager::getEvictedBackings(BackingVector& evictedBackings)

+void CCPrioritizedTextureManager::getEvictedBackings(BackingList& evictedBackings)

{

ASSERT(CCProxy::isImplThread());

evictedBackings.clear();

- evictedBackings.append(m_evictedBackings);

+ evictedBackings.insert(evictedBackings.begin(), m_evictedBackings.begin(), m_evictedBackings.end());

}

-void CCPrioritizedTextureManager::unlinkEvictedBackings(const BackingVector& evictedBackings)

+void CCPrioritizedTextureManager::unlinkEvictedBackings(const BackingList& evictedBackings)

{

ASSERT(CCProxy::isMainThread());

- for (BackingVector::const_iterator it = evictedBackings.begin(); it != evictedBackings.end(); ++it) {

+ for (BackingList::const_iterator it = evictedBackings.begin(); it != evictedBackings.end(); ++it) {

CCPrioritizedTexture::Backing* backing = (*it);

if (backing->owner())

backing->owner()->unlink();

@@ -298,11 +289,11 @@ void CCPrioritizedTextureManager::unlinkEvictedBackings(const BackingVector& evi

void CCPrioritizedTextureManager::deleteUnlinkedEvictedBackings()

{

ASSERT(CCProxy::isMainThread() || (CCProxy::isImplThread() && CCProxy::isMainThreadBlocked()));

- BackingVector newEvictedBackings;

- for (BackingVector::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {

+ BackingList newEvictedBackings;

+ for (BackingList::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {

CCPrioritizedTexture::Backing* backing = (*it);

if (backing->owner())

- newEvictedBackings.append(backing);

+ newEvictedBackings.push_back(backing);

else

delete backing;

}

@@ -311,7 +302,7 @@ void CCPrioritizedTextureManager::deleteUnlinkedEvictedBackings()

bool CCPrioritizedTextureManager::linkedEvictedBackingsExist() const

{

- for (BackingVector::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {

+ for (BackingList::const_iterator it = m_evictedBackings.begin(); it != m_evictedBackings.end(); ++it) {

if ((*it)->owner())

return true;

}

@@ -357,17 +348,15 @@ CCPrioritizedTexture::Backing* CCPrioritizedTextureManager::createBacking(IntSiz

CCResourceProvider::ResourceId resourceId = resourceProvider->createResource(m_pool, size, format, CCResourceProvider::TextureUsageAny);

CCPrioritizedTexture::Backing* backing = new CCPrioritizedTexture::Backing(resourceId, resourceProvider, size, format);

m_memoryUseBytes += backing->bytes();

- // Put backing texture at the front for eviction, since it isn't in use yet.

- m_backings.insertBefore(m_backings.begin(), backing);

return backing;

}

-void CCPrioritizedTextureManager::evictBackingResource(CCPrioritizedTexture::Backing* backing, CCResourceProvider* resourceProvider)

+void CCPrioritizedTextureManager::evictFirstBackingResource(CCResourceProvider* resourceProvider)

{

ASSERT(CCProxy::isImplThread());

- ASSERT(backing);

ASSERT(resourceProvider);

- ASSERT(m_backings.find(backing) != m_backings.end());

+ ASSERT(!m_backings.empty());

+ CCPrioritizedTexture::Backing* backing = m_backings.front();

// Note that we create a backing and its resource at the same time, but we

// delete the backing structure and its resource in two steps. This is because

@@ -375,13 +364,13 @@ void CCPrioritizedTextureManager::evictBackingResource(CCPrioritizedTexture::Bac

// unlink backings while the main thread is running.

backing->deleteResource(resourceProvider);

m_memoryUseBytes -= backing->bytes();

- m_backings.remove(backing);

- m_evictedBackings.append(backing);

+ m_backings.pop_front();

+ m_evictedBackings.push_back(backing);

}

-#if !ASSERT_DISABLED

void CCPrioritizedTextureManager::assertInvariants()

{

+#if !ASSERT_DISABLED

ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());

// If we hit any of these asserts, there is a bug in this class. To see

@@ -389,7 +378,7 @@ void CCPrioritizedTextureManager::assertInvariants()

// every public function.

// Backings/textures must be doubly-linked and only to other backings/textures in this manager.

- for (BackingSet::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

+ for (BackingList::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

if ((*it)->owner()) {

ASSERT(ContainsKey(m_textures, (*it)->owner()));

ASSERT((*it)->owner()->backing() == (*it));

@@ -400,11 +389,11 @@ void CCPrioritizedTextureManager::assertInvariants()

CCPrioritizedTexture::Backing* backing = texture->backing();

if (backing) {

if (backing->resourceHasBeenDeleted()) {

- ASSERT(m_backings.find(backing) == m_backings.end());

- ASSERT(m_evictedBackings.contains(backing));

+ ASSERT(std::find(m_backings.begin(), m_backings.end(), backing) == m_backings.end());

+ ASSERT(std::find(m_evictedBackings.begin(), m_evictedBackings.end(), backing) != m_evictedBackings.end());

} else {

- ASSERT(m_backings.find(backing) != m_backings.end());

- ASSERT(!m_evictedBackings.contains(backing));

+ ASSERT(std::find(m_backings.begin(), m_backings.end(), backing) != m_backings.end());

+ ASSERT(std::find(m_evictedBackings.begin(), m_evictedBackings.end(), backing) == m_evictedBackings.end());

}

ASSERT(backing->owner() == texture);

}

@@ -414,7 +403,7 @@ void CCPrioritizedTextureManager::assertInvariants()

// backings that can't be evicted in the backing texture list (otherwise

// reduceMemory will not find all textures available for eviction/recycling).

bool reachedUnrecyclable = false;

- for (BackingSet::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

+ for (BackingList::iterator it = m_backings.begin(); it != m_backings.end(); ++it) {

if (!(*it)->canBeRecycled())

reachedUnrecyclable = true;

if (reachedUnrecyclable)

@@ -422,8 +411,7 @@ void CCPrioritizedTextureManager::assertInvariants()

else

ASSERT((*it)->canBeRecycled());

}

#endif

} // namespace cc

« no previous file with comments | « cc/prioritized_texture_manager.h ('k') | cc/single_thread_proxy.cc » ('j') | no next file with comments »