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

Unified Diff: content/gpu/gpu_main.cc

Issue 194303002: Blacklist GLX indirect rendering (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 6 years, 9 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
« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | gpu/config/gpu_control_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 8176221343fddde1afb908558dd203b0990e669b..d478113b08bac94b002e3c3ba1ed3da3f049ac79 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -250,8 +250,19 @@ int GpuMain(const MainFunctionParams& parameters) {
base::TimeTicks before_collect_context_graphics_info =
base::TimeTicks::Now();
#if !defined(OS_MACOSX)
- if (!gpu::CollectContextGraphicsInfo(&gpu_info))
- VLOG(1) << "gpu::CollectGraphicsInfo failed";
+ gpu::CollectInfoResult result =
+ gpu::CollectContextGraphicsInfo(&gpu_info);
+ switch (result) {
+ case gpu::kCollectInfoFatalFailure:
+ LOG(ERROR) << "gpu::CollectGraphicsInfo failed (fatal).";
+ dead_on_arrival = true;
+ break;
+ case gpu::kCollectInfoNonFatalFailure:
+ VLOG(1) << "gpu::CollectGraphicsInfo failed (non-fatal).";
+ break;
+ case gpu::kCollectInfoSuccess:
+ break;
+ }
GetContentClient()->SetGpuInfo(gpu_info);
#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | gpu/config/gpu_control_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698