| 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_thread.h" | 5 #include "chrome/gpu/gpu_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" | 10 #include "app/gfx/gl/gl_context.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "chrome/common/child_process.h" | 13 #include "chrome/common/child_process.h" |
| 14 #include "chrome/common/gpu_info.h" | 14 #include "chrome/common/gpu_info.h" |
| 15 #include "chrome/common/gpu_messages.h" | 15 #include "chrome/common/gpu_messages.h" |
| 16 #include "chrome/gpu/gpu_info_collector.h" | 16 #include "chrome/gpu/gpu_info_collector.h" |
| 17 #include "ipc/ipc_channel_handle.h" |
| 17 | 18 |
| 18 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
| 19 #include "chrome/gpu/gpu_view_win.h" | 20 #include "chrome/gpu/gpu_view_win.h" |
| 20 #elif defined(GPU_USE_GLX) | 21 #elif defined(GPU_USE_GLX) |
| 21 #include "chrome/gpu/gpu_backing_store_glx_context.h" | 22 #include "chrome/gpu/gpu_backing_store_glx_context.h" |
| 22 #include "chrome/gpu/gpu_view_x.h" | 23 #include "chrome/gpu/gpu_view_x.h" |
| 23 | 24 |
| 24 #include <X11/Xutil.h> // Must be last. | 25 #include <X11/Xutil.h> // Must be last. |
| 25 #endif | 26 #endif |
| 26 | 27 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 // message to destroy the GpuRWHView when necessary. So we don't manage the | 138 // message to destroy the GpuRWHView when necessary. So we don't manage the |
| 138 // lifetime of this object. | 139 // lifetime of this object. |
| 139 #if defined(OS_WIN) | 140 #if defined(OS_WIN) |
| 140 new GpuViewWin(this, parent_window, routing_id); | 141 new GpuViewWin(this, parent_window, routing_id); |
| 141 #elif defined(GPU_USE_GLX) | 142 #elif defined(GPU_USE_GLX) |
| 142 new GpuViewX(this, parent_window, routing_id); | 143 new GpuViewX(this, parent_window, routing_id); |
| 143 #else | 144 #else |
| 144 NOTIMPLEMENTED(); | 145 NOTIMPLEMENTED(); |
| 145 #endif | 146 #endif |
| 146 } | 147 } |
| OLD | NEW |