| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/gpu/gpu_channel.h" |
| 6 |
| 5 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 6 #include <windows.h> | 8 #include <windows.h> |
| 7 #endif | 9 #endif |
| 8 | 10 |
| 9 #include "chrome/gpu/gpu_channel.h" | |
| 10 | |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/lock.h" | 12 #include "base/lock.h" |
| 13 #include "base/process_util.h" | 13 #include "base/process_util.h" |
| 14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
| 15 #include "base/waitable_event.h" | |
| 16 #include "build/build_config.h" | |
| 17 #include "chrome/common/child_process.h" | 15 #include "chrome/common/child_process.h" |
| 18 #include "chrome/common/chrome_constants.h" | 16 #include "chrome/common/chrome_constants.h" |
| 19 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/gpu_messages.h" | 18 #include "chrome/common/gpu_messages.h" |
| 21 #include "chrome/gpu/gpu_thread.h" | 19 #include "chrome/gpu/gpu_thread.h" |
| 22 | 20 |
| 23 #if defined(OS_POSIX) | 21 #if defined(OS_POSIX) |
| 24 #include "ipc/ipc_channel_posix.h" | 22 #include "ipc/ipc_channel_posix.h" |
| 25 #endif | 23 #endif |
| 26 | 24 |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 channel_.reset(new IPC::SyncChannel( | 197 channel_.reset(new IPC::SyncChannel( |
| 200 channel_name, IPC::Channel::MODE_SERVER, this, NULL, | 198 channel_name, IPC::Channel::MODE_SERVER, this, NULL, |
| 201 ChildProcess::current()->io_message_loop(), false, | 199 ChildProcess::current()->io_message_loop(), false, |
| 202 ChildProcess::current()->GetShutDownEvent())); | 200 ChildProcess::current()->GetShutDownEvent())); |
| 203 return true; | 201 return true; |
| 204 } | 202 } |
| 205 | 203 |
| 206 std::string GpuChannel::GetChannelName() { | 204 std::string GpuChannel::GetChannelName() { |
| 207 return StringPrintf("%d.r%d", base::GetCurrentProcId(), renderer_id_); | 205 return StringPrintf("%d.r%d", base::GetCurrentProcId(), renderer_id_); |
| 208 } | 206 } |
| OLD | NEW |