Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp - Issue 10702135: Merge 120858 - [chromium] Separate LayerRenderer initialization from updateLayers

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/CCThreadProxy.cpp

Issue 10702135: Merge 120858 - [chromium] Separate LayerRenderer initialization from updateLayers (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/

Patch Set: Created 8 years, 5 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/CCSingleThreadProxy.cpp ('k') | Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

--- Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (revision 122256)

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

@@ -103,7 +103,7 @@

ASSERT(isMainThread());

ASSERT(m_layerTreeHost);

- if (!m_layerRendererInitialized) {

+ if (!m_layerTreeHost->initializeLayerRendererIfNeeded()) {

TRACE_EVENT("compositeAndReadback_EarlyOut_LR_Uninitialized", this, 0);

return false;

}

@@ -509,9 +509,11 @@

m_commitRequested = false;

m_forcedCommitRequested = false;

- if (!m_layerTreeHost->updateLayers(*request->updater))

+ if (!m_layerTreeHost->initializeLayerRendererIfNeeded())

return;

+ m_layerTreeHost->updateLayers(*request->updater);

// Once single buffered layers are committed, they cannot be modified until

// they are drawn by the impl thread.

m_texturesAcquired = false;