| 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 #if defined(OS_WIN) | 5 #if defined(OS_WIN) |
| 6 #include <windows.h> | 6 #include <windows.h> |
| 7 #endif | 7 #endif |
| 8 | 8 |
| 9 #include "chrome/gpu/gpu_channel.h" | 9 #include "chrome/gpu/gpu_channel.h" |
| 10 | 10 |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/process_util.h" | 12 #include "base/process_util.h" |
| 13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
| 14 #include "chrome/common/chrome_constants.h" | 14 #include "chrome/common/chrome_constants.h" |
| 15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/gpu_messages.h" | |
| 17 #include "chrome/gpu/gpu_thread.h" | 16 #include "chrome/gpu/gpu_thread.h" |
| 18 #include "chrome/gpu/gpu_video_service.h" | 17 #include "chrome/gpu/gpu_video_service.h" |
| 19 #include "content/common/child_process.h" | 18 #include "content/common/child_process.h" |
| 19 #include "content/common/gpu_messages.h" |
| 20 | 20 |
| 21 #if defined(OS_POSIX) | 21 #if defined(OS_POSIX) |
| 22 #include "ipc/ipc_channel_posix.h" | 22 #include "ipc/ipc_channel_posix.h" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| 25 GpuChannel::GpuChannel(GpuThread* gpu_thread, | 25 GpuChannel::GpuChannel(GpuThread* gpu_thread, |
| 26 int renderer_id) | 26 int renderer_id) |
| 27 : gpu_thread_(gpu_thread), | 27 : gpu_thread_(gpu_thread), |
| 28 renderer_id_(renderer_id), | 28 renderer_id_(renderer_id), |
| 29 renderer_process_(NULL), | 29 renderer_process_(NULL), |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 #if defined(OS_POSIX) | 250 #if defined(OS_POSIX) |
| 251 int GpuChannel::GetRendererFileDescriptor() { | 251 int GpuChannel::GetRendererFileDescriptor() { |
| 252 int fd = -1; | 252 int fd = -1; |
| 253 if (channel_.get()) { | 253 if (channel_.get()) { |
| 254 fd = channel_->GetClientFileDescriptor(); | 254 fd = channel_->GetClientFileDescriptor(); |
| 255 } | 255 } |
| 256 return fd; | 256 return fd; |
| 257 } | 257 } |
| 258 #endif // defined(OS_POSIX) | 258 #endif // defined(OS_POSIX) |
| 259 | 259 |
| OLD | NEW |