cc/test/layer_tree_test.cc - Issue 20185002: ContextProvider in OutputSurface

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/test/layer_tree_test.cc

Issue 20185002: ContextProvider in OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: contextprovider: fix android output surface impls Created 7 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:

Index: cc/test/layer_tree_test.cc

diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc

index 7192f6d01a3aef0ca902fa5a88b640e5cd35e681..6795f90dfb651d314b91c50d0bafebb7a1969cf9 100644

--- a/cc/test/layer_tree_test.cc

+++ b/cc/test/layer_tree_test.cc

@@ -616,7 +616,7 @@ scoped_refptr<cc::ContextProvider> LayerTreeTest::

if (!main_thread_contexts_.get() ||

main_thread_contexts_->DestroyedOnMainThread()) {

main_thread_contexts_ = TestContextProvider::Create();

- if (!main_thread_contexts_->BindToCurrentThread())

+ if (main_thread_contexts_ && !main_thread_contexts_->BindToCurrentThread())

main_thread_contexts_ = NULL;

}

return main_thread_contexts_;