cc/CCPrioritizedTextureManager.cpp - Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/CCPrioritizedTextureManager.cpp

Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge fix 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:

Index: cc/CCPrioritizedTextureManager.cpp

diff --git a/cc/CCPrioritizedTextureManager.cpp b/cc/CCPrioritizedTextureManager.cpp

index 584d6caa5663ac5db846252479b8f34b779e249e..54f8ac2e6a8ce3c6ae95c23891b796bb09f12577 100644

--- a/cc/CCPrioritizedTextureManager.cpp

+++ b/cc/CCPrioritizedTextureManager.cpp

@@ -183,7 +183,7 @@ void CCPrioritizedTextureManager::acquireBackingTextureIfNeeded(CCPrioritizedTex

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

if ((*it)->hadOwnerAtLastPriorityUpdate() && (*it)->wasAbovePriorityCutoffAtLastPriorityUpdate())

break;

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

+ if ((*it)->size() == texture->size() && (*it)->format() == texture->format() && !resourceProvider->inUseByConsumer((*it)->id())) {

backing = (*it);

break;

}