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

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

Issue 1292263003: ipc: Use a global for the process's attachment broker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipc_message2
Patch Set: Comments from avi. 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 | « content/common/gpu/gpu_channel_manager.h ('k') | content/common/gpu/gpu_channel_test_common.h » ('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 0359393f1ae0f1075585f4c21ffdf04b4248641a..df99ccda3386679b185c183d89871a226659836a 100644
--- a/content/common/gpu/gpu_channel_manager.cc
+++ b/content/common/gpu/gpu_channel_manager.cc
@@ -35,7 +35,6 @@ GpuChannelManager::GpuChannelManager(
base::SingleThreadTaskRunner* task_runner,
base::SingleThreadTaskRunner* io_task_runner,
base::WaitableEvent* shutdown_event,
- IPC::AttachmentBroker* broker,
gpu::SyncPointManager* sync_point_manager,
GpuMemoryBufferFactory* gpu_memory_buffer_factory)
: task_runner_(task_runner),
@@ -48,7 +47,6 @@ GpuChannelManager::GpuChannelManager(
GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit),
sync_point_manager_(sync_point_manager),
gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
- attachment_broker_(broker),
weak_factory_(this) {
DCHECK(task_runner);
DCHECK(io_task_runner);
@@ -171,8 +169,7 @@ void GpuChannelManager::OnEstablishChannel(int client_id,
scoped_ptr<GpuChannel> channel = CreateGpuChannel(
share_group, mailbox_manager, client_id, client_tracing_id,
allow_future_sync_points, allow_real_time_streams);
- IPC::ChannelHandle channel_handle =
- channel->Init(shutdown_event_, attachment_broker_);
+ IPC::ChannelHandle channel_handle = channel->Init(shutdown_event_);
gpu_channels_.set(client_id, channel.Pass());
« no previous file with comments | « content/common/gpu/gpu_channel_manager.h ('k') | content/common/gpu/gpu_channel_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698