| Index: content/gpu/gpu_info_collector_android.cc
|
| ===================================================================
|
| --- content/gpu/gpu_info_collector_android.cc (revision 201163)
|
| +++ content/gpu/gpu_info_collector_android.cc (working copy)
|
| @@ -43,9 +43,9 @@
|
|
|
| }
|
|
|
| -namespace gpu_info_collector {
|
| +namespace gpu {
|
|
|
| -bool CollectContextGraphicsInfo(content::GPUInfo* gpu_info) {
|
| +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) {
|
| return CollectBasicGraphicsInfo(gpu_info);
|
| }
|
|
|
| @@ -56,7 +56,7 @@
|
| return kGpuIDNotSupported;
|
| }
|
|
|
| -bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) {
|
| +bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
|
| gpu_info->can_lose_context = false;
|
| gpu_info->finalized = true;
|
|
|
| @@ -66,15 +66,15 @@
|
| return CollectGraphicsInfoGL(gpu_info);
|
| }
|
|
|
| -bool CollectDriverInfoGL(content::GPUInfo* gpu_info) {
|
| +bool CollectDriverInfoGL(GPUInfo* gpu_info) {
|
| gpu_info->driver_version = GetDriverVersionFromString(
|
| gpu_info->gl_version_string);
|
| return true;
|
| }
|
|
|
| -void MergeGPUInfo(content::GPUInfo* basic_gpu_info,
|
| - const content::GPUInfo& context_gpu_info) {
|
| +void MergeGPUInfo(GPUInfo* basic_gpu_info,
|
| + const GPUInfo& context_gpu_info) {
|
| MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
|
| }
|
|
|
| -} // namespace gpu_info_collector
|
| +} // namespace gpu
|
|
|