| Index: content/common/gpu/gpu_channel.cc
|
| ===================================================================
|
| --- content/common/gpu/gpu_channel.cc (revision 0)
|
| +++ content/common/gpu/gpu_channel.cc (working copy)
|
| @@ -6,7 +6,7 @@
|
| #include <windows.h>
|
| #endif
|
|
|
| -#include "content/gpu/gpu_channel.h"
|
| +#include "content/common/gpu/gpu_channel.h"
|
|
|
| #include "base/command_line.h"
|
| #include "base/process_util.h"
|
| @@ -15,22 +15,22 @@
|
| #include "content/common/content_client.h"
|
| #include "content/common/content_switches.h"
|
| #include "content/common/gpu_messages.h"
|
| -#include "content/gpu/gpu_render_thread.h"
|
| -#include "content/gpu/gpu_video_service.h"
|
| +#include "content/common/gpu/gpu_channel_manager.h"
|
| +#include "content/common/gpu/gpu_video_service.h"
|
|
|
| #if defined(OS_POSIX)
|
| #include "ipc/ipc_channel_posix.h"
|
| #endif
|
|
|
| -GpuChannel::GpuChannel(GpuRenderThread* gpu_render_thread,
|
| +GpuChannel::GpuChannel(GpuChannelManager* gpu_channel_manager,
|
| GpuWatchdogThread* gpu_watchdog_thread,
|
| int renderer_id)
|
| - : gpu_render_thread_(gpu_render_thread),
|
| + : gpu_channel_manager_(gpu_channel_manager),
|
| renderer_id_(renderer_id),
|
| renderer_process_(base::kNullProcessHandle),
|
| renderer_pid_(base::kNullProcessId),
|
| watchdog_thread_(gpu_watchdog_thread) {
|
| - DCHECK(gpu_render_thread);
|
| + DCHECK(gpu_channel_manager);
|
| DCHECK(renderer_id);
|
| const CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| log_messages_ = command_line->HasSwitch(switches::kLogPluginMessages);
|
| @@ -68,7 +68,7 @@
|
| }
|
|
|
| void GpuChannel::OnChannelError() {
|
| - gpu_render_thread_->RemoveChannel(renderer_id_);
|
| + gpu_channel_manager_->RemoveChannel(renderer_id_);
|
| }
|
|
|
| void GpuChannel::OnChannelConnected(int32 peer_pid) {
|
|
|