Source/WebKit/chromium/tests/CCLayerTreeHostTest.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/WebKit/chromium/tests/CCLayerTreeHostTest.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/CCThreadProxy.cpp ('k') | Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

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

--- Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (revision 122256)

+++ Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (working copy)

@@ -1687,6 +1687,7 @@

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds());

+ ASSERT_TRUE(m_layerTreeHost->initializeLayerRendererIfNeeded());

CCTextureUpdater updater;

m_layerTreeHost->updateLayers(updater);

m_layerTreeHost->commitComplete();

@@ -1894,6 +1895,7 @@

m_layerTreeHost->setRootLayer(rootLayer);

m_layerTreeHost->setViewportSize(rootLayer->bounds());

+ ASSERT_TRUE(m_layerTreeHost->initializeLayerRendererIfNeeded());

CCTextureUpdater updater;

m_layerTreeHost->updateLayers(updater);

m_layerTreeHost->commitComplete();

@@ -1982,6 +1984,7 @@

m_layerTreeHost->setRootLayer(layers[0].get());

m_layerTreeHost->setViewportSize(layers[0]->bounds());

+ ASSERT_TRUE(m_layerTreeHost->initializeLayerRendererIfNeeded());

CCTextureUpdater updater;

m_layerTreeHost->updateLayers(updater);

m_layerTreeHost->commitComplete();