| Index: content/gpu/gpu_info_collector_linux.cc
|
| ===================================================================
|
| --- content/gpu/gpu_info_collector_linux.cc (revision 111230)
|
| +++ content/gpu/gpu_info_collector_linux.cc (working copy)
|
| @@ -182,16 +182,8 @@
|
| }
|
|
|
| gpu_info->finalized = true;
|
| - return CollectGraphicsInfoGL(gpu_info);
|
| -}
|
| + bool rt = CollectGraphicsInfoGL(gpu_info);
|
|
|
| -bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
|
| - DCHECK(gpu_info);
|
| -
|
| - bool rt = true;
|
| - if (!CollectVideoCardInfo(gpu_info))
|
| - rt = false;
|
| -
|
| if (gpu_info->vendor_id == 0x1002) { // ATI
|
| std::string ati_driver_version = CollectDriverVersionATI();
|
| if (ati_driver_version != "") {
|
| @@ -203,6 +195,12 @@
|
| return rt;
|
| }
|
|
|
| +bool CollectPreliminaryGraphicsInfo(content::GPUInfo* gpu_info) {
|
| + DCHECK(gpu_info);
|
| +
|
| + return CollectVideoCardInfo(gpu_info);
|
| +}
|
| +
|
| bool CollectVideoCardInfo(content::GPUInfo* gpu_info) {
|
| DCHECK(gpu_info);
|
|
|
|
|