Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp - Issue 10836250: Merge 125577 - [chromium] race between CCLayerTreeHostImpl::releaseContentsTextures and CCThreadPro…

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: Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp

Issue 10836250: Merge 125577 - [chromium] race between CCLayerTreeHostImpl::releaseContentsTextures and CCThreadPro… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 4 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

« no previous file with comments | « Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp ('k') | Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp

===================================================================

--- Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (revision 125598)

+++ Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (working copy)

@@ -260,7 +260,7 @@

DebugScopedSetMainThreadBlocked mainThreadBlocked;

DebugScopedSetImplThread impl;

- if (!m_layerTreeHostImpl->contentsTexturesWerePurgedSinceLastCommit())

+ if (!m_layerTreeHostImpl->contentsTexturesPurged())

m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider());

m_layerTreeHostImpl.clear();

}

@@ -300,11 +300,12 @@

if (!m_layerTreeHost->initializeLayerRendererIfNeeded())

return false;

- if (m_layerTreeHostImpl->contentsTexturesWerePurgedSinceLastCommit())

+ if (m_layerTreeHostImpl->contentsTexturesPurged())

m_layerTreeHost->evictAllContentTextures();

CCTextureUpdateQueue queue;

m_layerTreeHost->updateLayers(queue, m_layerTreeHostImpl->memoryAllocationLimitBytes());

+ m_layerTreeHostImpl->resetContentsTexturesPurged();

m_layerTreeHost->willCommit();

doCommit(queue);