diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2014-11-20 06:55:14 +0000 |
| commit | 347e2bc55f9baf2b44a6b265c5ce110d2ed4b9b8 (patch) | |
| tree | 9225b2ce830d701121dcc56dc30db0eb6bf6af71 /www/chromium/files/patch-gpu__config__gpu_test_config.cc | |
| parent | - Upgrade to 0.010002. (diff) | |
www/chromium: update to 39.0.2171.65
MFH: 2014Q4
Security: d395e44f-6f4f-11e4-a444-00262d5ed8ee
Diffstat (limited to 'www/chromium/files/patch-gpu__config__gpu_test_config.cc')
| -rw-r--r-- | www/chromium/files/patch-gpu__config__gpu_test_config.cc | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc index bb5d0db1aecf..86551afb8f10 100644 --- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc +++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc @@ -1,35 +1,26 @@ ---- gpu/config/gpu_test_config.cc.orig 2014-10-02 17:39:47 UTC +--- gpu/config/gpu_test_config.cc.orig 2014-10-10 08:54:15 UTC +++ gpu/config/gpu_test_config.cc -@@ -23,8 +23,6 @@ +@@ -23,7 +23,7 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) -- return GPUTestConfig::kOsLinux; ++#elif defined(OS_LINUX) || defined(OS_BSD) + return GPUTestConfig::kOsLinux; #elif defined(OS_WIN) int32 major_version = 0; - int32 minor_version = 0; -@@ -61,6 +59,8 @@ - } - #elif defined(OS_ANDROID) - return GPUTestConfig::kOsAndroid; -+#elif defined(OS_POSIX) -+ return GPUTestConfig::kOsLinux; - #endif - return GPUTestConfig::kOsUnknown; - } -@@ -234,6 +234,10 @@ +@@ -233,6 +233,10 @@ + bool rt; if (gpu_info == NULL) { GPUInfo my_gpu_info; - GpuIDResult result; +#if defined(OS_FREEBSD) + rt = false; + LOG(WARNING) << "CollectGpuID not present on FreeBSD"; +#else - result = CollectGpuID(&my_gpu_info.gpu.vendor_id, - &my_gpu_info.gpu.device_id); - if (result == kGpuIDNotSupported) { -@@ -243,6 +247,7 @@ + CollectInfoResult result = CollectGpuID( + &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id); + if (result != kCollectInfoSuccess) { +@@ -242,6 +246,7 @@ } else { rt = SetGPUInfo(my_gpu_info); } |