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 "content/gpu/gpu_info_collector.h" | 5 #include "content/gpu/gpu_info_collector.h" |
6 | 6 |
7 #include "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
11 #include "base/string_piece.h" | |
12 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/strings/string_piece.h" |
13 #include "base/strings/string_split.h" | 13 #include "base/strings/string_split.h" |
14 #include "cc/base/switches.h" | 14 #include "cc/base/switches.h" |
15 #include "content/public/common/content_switches.h" | 15 #include "content/public/common/content_switches.h" |
16 #include "ui/gfx/android/device_display_info.h" | 16 #include "ui/gfx/android/device_display_info.h" |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 std::string GetDriverVersionFromString(const std::string& version_string) { | 20 std::string GetDriverVersionFromString(const std::string& version_string) { |
21 // Extract driver version from the second number in a string like: | 21 // Extract driver version from the second number in a string like: |
22 // "OpenGL ES 2.0 V@6.0 AU@ (CL@2946718)" | 22 // "OpenGL ES 2.0 V@6.0 AU@ (CL@2946718)" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 gpu_info->gl_version_string); | 147 gpu_info->gl_version_string); |
148 return true; | 148 return true; |
149 } | 149 } |
150 | 150 |
151 void MergeGPUInfo(content::GPUInfo* basic_gpu_info, | 151 void MergeGPUInfo(content::GPUInfo* basic_gpu_info, |
152 const content::GPUInfo& context_gpu_info) { | 152 const content::GPUInfo& context_gpu_info) { |
153 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 153 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
154 } | 154 } |
155 | 155 |
156 } // namespace gpu_info_collector | 156 } // namespace gpu_info_collector |
OLD | NEW |