OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "gpu/config/gpu_info_collector.h" | 5 #include "gpu/config/gpu_info_collector.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
11 #include "base/mac/scoped_cftyperef.h" | 11 #include "base/mac/scoped_cftyperef.h" |
12 #include "base/mac/scoped_ioobject.h" | 12 #include "base/mac/scoped_ioobject.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
15 #include "base/strings/string_piece.h" | 14 #include "base/strings/string_piece.h" |
16 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
17 #include "base/strings/sys_string_conversions.h" | 16 #include "base/strings/sys_string_conversions.h" |
18 #include "base/trace_event/trace_event.h" | 17 #include "base/trace_event/trace_event.h" |
19 #include "ui/gl/gl_bindings.h" | 18 #include "ui/gl/gl_bindings.h" |
20 #include "ui/gl/gl_context.h" | 19 #include "ui/gl/gl_context.h" |
21 #include "ui/gl/gl_implementation.h" | 20 #include "ui/gl/gl_implementation.h" |
22 | 21 |
23 #import <Cocoa/Cocoa.h> | 22 #import <Cocoa/Cocoa.h> |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 gpu_info->driver_version = gpu_info->gl_version.substr(pos + 1); | 216 gpu_info->driver_version = gpu_info->gl_version.substr(pos + 1); |
218 return kCollectInfoSuccess; | 217 return kCollectInfoSuccess; |
219 } | 218 } |
220 | 219 |
221 void MergeGPUInfo(GPUInfo* basic_gpu_info, | 220 void MergeGPUInfo(GPUInfo* basic_gpu_info, |
222 const GPUInfo& context_gpu_info) { | 221 const GPUInfo& context_gpu_info) { |
223 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 222 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
224 } | 223 } |
225 | 224 |
226 } // namespace gpu | 225 } // namespace gpu |
OLD | NEW |