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

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

Issue 6722026: Refactor: Move app/gfx/gl ==> ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try removing a dep. 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/content_gpu.gypi ('k') | content/gpu/gpu_info_collector.cc » ('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) 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 #include "content/gpu/gpu_child_thread.h" 5 #include "content/gpu/gpu_child_thread.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/gfx/gl/gl_context.h"
11 #include "app/gfx/gl/gl_implementation.h"
12 #include "app/win/scoped_com_initializer.h" 10 #include "app/win/scoped_com_initializer.h"
13 #include "base/command_line.h" 11 #include "base/command_line.h"
14 #include "base/threading/worker_pool.h" 12 #include "base/threading/worker_pool.h"
15 #include "build/build_config.h" 13 #include "build/build_config.h"
16 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
17 #include "content/common/child_process.h" 15 #include "content/common/child_process.h"
18 #include "content/common/gpu_messages.h" 16 #include "content/common/gpu_messages.h"
19 #include "content/gpu/content_gpu_client.h" 17 #include "content/gpu/content_gpu_client.h"
20 #include "content/gpu/gpu_info_collector.h" 18 #include "content/gpu/gpu_info_collector.h"
21 #include "content/gpu/gpu_watchdog_thread.h" 19 #include "content/gpu/gpu_watchdog_thread.h"
22 #include "ipc/ipc_channel_handle.h" 20 #include "ipc/ipc_channel_handle.h"
21 #include "ui/gfx/gl/gl_context.h"
22 #include "ui/gfx/gl/gl_implementation.h"
23 23
24 #if defined(OS_MACOSX) 24 #if defined(OS_MACOSX)
25 #include "content/common/sandbox_init_wrapper.h" 25 #include "content/common/sandbox_init_wrapper.h"
26 #include "content/common/sandbox_mac.h" 26 #include "content/common/sandbox_mac.h"
27 #elif defined(OS_WIN) 27 #elif defined(OS_WIN)
28 #include "sandbox/src/sandbox.h" 28 #include "sandbox/src/sandbox.h"
29 #endif 29 #endif
30 30
31 const int kGpuTimeout = 10000; 31 const int kGpuTimeout = 10000;
32 32
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 // Runs on the main thread. 262 // Runs on the main thread.
263 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread, 263 void GpuChildThread::SetDxDiagnostics(GpuChildThread* thread,
264 const DxDiagNode& node) { 264 const DxDiagNode& node) {
265 thread->gpu_info_.dx_diagnostics = node; 265 thread->gpu_info_.dx_diagnostics = node;
266 thread->gpu_info_.finalized = true; 266 thread->gpu_info_.finalized = true;
267 thread->collecting_dx_diagnostics_ = false; 267 thread->collecting_dx_diagnostics_ = false;
268 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_)); 268 thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_));
269 } 269 }
270 270
271 #endif 271 #endif
OLDNEW
« no previous file with comments | « content/content_gpu.gypi ('k') | content/gpu/gpu_info_collector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698