content/browser/android/in_process/synchronous_compositor_factory_impl.cc - Issue 1317743002: cc: Implement shared worker contexts. (v1)

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: content/browser/android/in_process/synchronous_compositor_factory_impl.cc

Issue 1317743002: cc: Implement shared worker contexts. (v1) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add missing context3d_task_runner_ check Created 5 years, 3 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 | « cc/trees/layer_tree_host_unittest.cc ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | content/common/gpu/client/context_provider_command_buffer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/in_process/synchronous_compositor_factory_impl.cc

diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc

index 220c86244f057387b9221809109de194188a0e69..18c544cb9614cc5f9556f9211dc77e1a232aaf1d 100644

--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc

+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc

@@ -173,6 +173,14 @@ SynchronousCompositorFactoryImpl::CreateOutputSurface(

CreateContextProviderForCompositor(surface_id, RENDER_COMPOSITOR_CONTEXT);

scoped_refptr<cc::ContextProvider> worker_context =

CreateContextProviderForCompositor(0, RENDER_WORKER_CONTEXT);

+ if (!worker_context->BindToCurrentThread())

+ worker_context = nullptr;

+ if (worker_context) {

+ worker_context->SetupLock();

+ // Detach from thread to allow context to be destroyed on a

+ // different thread without being used.

+ worker_context->DetachFromThread();

+ }

return make_scoped_ptr(new SynchronousCompositorOutputSurface(

onscreen_context, worker_context, routing_id, frame_swap_message_queue));