Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(841)

Unified Diff: content/common/gpu/gpu_channel_manager.cc

Issue 1184523003: attachment broker wip (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor comments. Created 5 years, 6 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 | « content/common/gpu/gpu_channel_manager.h ('k') | content/common/gpu/gpu_channel_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4cec7cb3c8114656a0138f24c144935a56bebb1f..36e517ac66f8da62d162a733b9ed8f2f5b32783b 100644
--- a/content/common/gpu/gpu_channel_manager.cc
+++ b/content/common/gpu/gpu_channel_manager.cc
@@ -93,7 +93,8 @@ GpuChannelManager::GpuChannelManager(
GpuWatchdog* watchdog,
base::SingleThreadTaskRunner* io_task_runner,
base::WaitableEvent* shutdown_event,
- IPC::SyncChannel* channel)
+ IPC::SyncChannel* channel,
+ IPC::AttachmentBroker* broker)
: io_task_runner_(io_task_runner),
shutdown_event_(shutdown_event),
router_(router),
@@ -108,6 +109,7 @@ GpuChannelManager::GpuChannelManager(
filter_(
new GpuChannelManagerMessageFilter(gpu_memory_buffer_factory_.get())),
relinquish_resources_pending_(false),
+ attachment_broker_(broker),
weak_factory_(this) {
DCHECK(router_);
DCHECK(io_task_runner);
@@ -210,7 +212,7 @@ void GpuChannelManager::OnEstablishChannel(int client_id,
client_id,
false,
allow_future_sync_points));
- channel->Init(io_task_runner_.get(), shutdown_event_);
+ channel->Init(io_task_runner_.get(), shutdown_event_, attachment_broker_);
channel_handle.name = channel->GetChannelName();
#if defined(OS_POSIX)
« no previous file with comments | « content/common/gpu/gpu_channel_manager.h ('k') | content/common/gpu/gpu_channel_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698