OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/common/gpu/gpu_channel.h" | 9 #include "content/common/gpu/gpu_channel.h" |
10 | 10 |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/debug/trace_event.h" | 12 #include "base/debug/trace_event.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 "content/common/child_process.h" | 15 #include "content/common/child_process.h" |
16 #include "content/common/content_client.h" | |
17 #include "content/common/gpu/gpu_channel_manager.h" | 16 #include "content/common/gpu/gpu_channel_manager.h" |
18 #include "content/common/gpu/gpu_messages.h" | 17 #include "content/common/gpu/gpu_messages.h" |
19 #include "content/common/gpu/transport_texture.h" | 18 #include "content/common/gpu/transport_texture.h" |
| 19 #include "content/public/common/content_client.h" |
20 #include "content/public/common/content_switches.h" | 20 #include "content/public/common/content_switches.h" |
21 #include "ui/gfx/gl/gl_context.h" | 21 #include "ui/gfx/gl/gl_context.h" |
22 #include "ui/gfx/gl/gl_surface.h" | 22 #include "ui/gfx/gl/gl_surface.h" |
23 | 23 |
24 #if defined(OS_POSIX) | 24 #if defined(OS_POSIX) |
25 #include "ipc/ipc_channel_posix.h" | 25 #include "ipc/ipc_channel_posix.h" |
26 #endif | 26 #endif |
27 | 27 |
28 GpuChannel::GpuChannel(GpuChannelManager* gpu_channel_manager, | 28 GpuChannel::GpuChannel(GpuChannelManager* gpu_channel_manager, |
29 GpuWatchdog* watchdog, | 29 GpuWatchdog* watchdog, |
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 | 439 |
440 #if defined(OS_POSIX) | 440 #if defined(OS_POSIX) |
441 int GpuChannel::TakeRendererFileDescriptor() { | 441 int GpuChannel::TakeRendererFileDescriptor() { |
442 if (!channel_.get()) { | 442 if (!channel_.get()) { |
443 NOTREACHED(); | 443 NOTREACHED(); |
444 return -1; | 444 return -1; |
445 } | 445 } |
446 return channel_->TakeClientFileDescriptor(); | 446 return channel_->TakeClientFileDescriptor(); |
447 } | 447 } |
448 #endif // defined(OS_POSIX) | 448 #endif // defined(OS_POSIX) |
OLD | NEW |