content/common/gpu/gpu_channel_manager.cc - Issue 1231263003: Share SyncPointManager between ipc and in-process

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/common/gpu/gpu_channel_manager.cc

Issue 1231263003: Share SyncPointManager between ipc and in-process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove forward decl/includes Created 5 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:

Index: content/common/gpu/gpu_channel_manager.cc

diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc

index c8992dfdc9503511b0cba6eea34f3be7b3950bf8..f7d13bf5e43e9b35ba80d1e155d26ff33c291cf3 100644

--- a/content/common/gpu/gpu_channel_manager.cc

+++ b/content/common/gpu/gpu_channel_manager.cc

@@ -39,6 +39,7 @@ GpuChannelManager::GpuChannelManager(

base::WaitableEvent* shutdown_event,

IPC::SyncChannel* channel,

IPC::AttachmentBroker* broker,

+ gpu::SyncPointManager* sync_point_manager,

GpuMemoryBufferFactory* gpu_memory_buffer_factory)

: io_task_runner_(io_task_runner),

shutdown_event_(shutdown_event),

@@ -47,7 +48,7 @@ GpuChannelManager::GpuChannelManager(

this,

GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit),

watchdog_(watchdog),

- sync_point_manager_(gpu::SyncPointManager::Create(false)),

+ sync_point_manager_(sync_point_manager),

gpu_memory_buffer_factory_(gpu_memory_buffer_factory),

channel_(channel),

relinquish_resources_pending_(false),