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

Side by Side Diff: content/gpu/gpu_channel.cc

Issue 6684015: Move chrome\gpu to content\gpu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/gpu/gpu_channel.h ('k') | content/gpu/gpu_command_buffer_stub.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 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 "chrome/gpu/gpu_channel.h" 9 #include "content/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/gpu/gpu_thread.h"
15 #include "chrome/gpu/gpu_video_service.h"
16 #include "content/common/child_process.h" 14 #include "content/common/child_process.h"
17 #include "content/common/content_switches.h" 15 #include "content/common/content_switches.h"
18 #include "content/common/gpu_messages.h" 16 #include "content/common/gpu_messages.h"
17 #include "content/gpu/gpu_thread.h"
18 #include "content/gpu/gpu_video_service.h"
19 19
20 #if defined(OS_POSIX) 20 #if defined(OS_POSIX)
21 #include "ipc/ipc_channel_posix.h" 21 #include "ipc/ipc_channel_posix.h"
22 #endif 22 #endif
23 23
24 GpuChannel::GpuChannel(GpuThread* gpu_thread, 24 GpuChannel::GpuChannel(GpuThread* gpu_thread,
25 int renderer_id) 25 int renderer_id)
26 : gpu_thread_(gpu_thread), 26 : gpu_thread_(gpu_thread),
27 renderer_id_(renderer_id), 27 renderer_id_(renderer_id),
28 renderer_process_(NULL), 28 renderer_process_(NULL),
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 #if defined(OS_POSIX) 251 #if defined(OS_POSIX)
252 int GpuChannel::GetRendererFileDescriptor() { 252 int GpuChannel::GetRendererFileDescriptor() {
253 int fd = -1; 253 int fd = -1;
254 if (channel_.get()) { 254 if (channel_.get()) {
255 fd = channel_->GetClientFileDescriptor(); 255 fd = channel_->GetClientFileDescriptor();
256 } 256 }
257 return fd; 257 return fd;
258 } 258 }
259 #endif // defined(OS_POSIX) 259 #endif // defined(OS_POSIX)
260 260
OLDNEW
« no previous file with comments | « content/gpu/gpu_channel.h ('k') | content/gpu/gpu_command_buffer_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698