Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1153)

Unified Diff: content/gpu/gpu_info_collector_linux.cc

Issue 8670004: Move GPU preliminary info collection back to UI thread. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/gpu_blacklist_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « content/browser/gpu/gpu_blacklist_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698