content/browser/android/in_process/synchronous_compositor_factory_impl.cc - Issue 1769913003: sync compositor: Add output_surface_id

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 1769913003: sync compositor: Add output_surface_id (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix unittests compile Created 4 years, 9 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

« android_webview/browser/test/rendering_test.cc ('K') | « content/browser/android/in_process/synchronous_compositor_factory_impl.h ('k') | content/browser/android/in_process/synchronous_compositor_impl.h » ('j') | content/browser/android/synchronous_compositor_host.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 385bb4f403ef500e967d500d75a7f4ce7969786a..72a5595322ebed8560d6985b9ba79b2987ca3236 100644

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

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

@@ -104,11 +104,12 @@ SynchronousCompositorFactoryImpl::GetCompositorTaskRunner() {

scoped_ptr<cc::OutputSurface>

SynchronousCompositorFactoryImpl::CreateOutputSurface(

int routing_id,

+ uint32_t output_surface_id,

const scoped_refptr<FrameSwapMessageQueue>& frame_swap_message_queue,

const scoped_refptr<cc::ContextProvider>& onscreen_context,

const scoped_refptr<cc::ContextProvider>& worker_context) {

return make_scoped_ptr(new SynchronousCompositorOutputSurface(

- onscreen_context, worker_context, routing_id,

+ onscreen_context, worker_context, routing_id, output_surface_id,

SynchronousCompositorRegistryInProc::GetInstance(),

frame_swap_message_queue));

}