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

Unified Diff: chrome/gpu/gpu_thread.cc

Issue 6531023: Collect as much GPU information as possible without creating a GL/D3D context... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: move safe info collection into gpu process Created 9 years, 10 months 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
« chrome/gpu/gpu_info_collector.h ('K') | « chrome/gpu/gpu_info_collector_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/gpu/gpu_thread.cc
===================================================================
--- chrome/gpu/gpu_thread.cc (revision 75352)
+++ chrome/gpu/gpu_thread.cc (working copy)
@@ -109,6 +109,19 @@
if (!single_process)
logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
+ // Collect as much GPU info as possible without creating GL/D3D context.
+ gpu_info_collector::CollectGraphicsInfoSafe(&gpu_info_);
+ LOG(INFO) << "gpu_info_collector::CollectGraphicsInfoSafe complete";
+
+ // Go through GPU blacklist with partial GPU info; if GPU is already
+ // blacklisted, don't create GL/D3D context.
+ bool blacklisted;
+ Send(new GpuHostMsg_GraphicsInfoCollectedSafe(gpu_info_, &blacklisted));
+ if (blacklisted) {
+ MessageLoop::current()->Quit();
Ken Russell (switch to Gerrit) 2011/02/18 22:21:24 How about a LOG(ERROR) like the other exit paths?
Zhenyao Mo 2011/02/18 22:41:52 Done.
+ return;
+ }
+
// Load the GL implementation and locate the bindings before starting the GPU
// watchdog because this can take a lot of time and the GPU watchdog might
// terminate the GPU process.
« chrome/gpu/gpu_info_collector.h ('K') | « chrome/gpu/gpu_info_collector_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698