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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2124633002: Add new gpu driver bug workaround DISABLE_TRANSPARENT_VISUALS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just make sure the new gpu driver workaround exist in second test instead of using fake values Created 4 years, 5 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 | « no previous file | content/test/gpu/page_sets/gpu_process_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 00ba343f8638f39a5a7602b190485e344f3c74c6..c4dc8d36e0d76ba4d6760cbbf1f150d0df783ae7 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -181,6 +181,7 @@
#endif
#if defined(USE_X11)
+#include "gpu/config/gpu_driver_bug_workaround_type.h"
#include "ui/base/x/x11_util_internal.h" // nogncheck
#include "ui/gfx/x/x11_connection.h" // nogncheck
#include "ui/gfx/x/x11_switches.h" // nogncheck
@@ -762,6 +763,22 @@ int BrowserMainLoop::PreCreateThreads() {
// 2) Must be after parts_->PreCreateThreads to pick up chrome://flags.
GpuDataManagerImpl::GetInstance()->Initialize();
+#if defined(USE_X11) && !defined(OS_CHROMEOS)
+ // PreCreateThreads is called before CreateStartupTasks which starts the gpu
+ // process.
+ bool enable_transparent_visuals =
+ !GpuDataManagerImpl::GetInstance()->IsDriverBugWorkaroundActive(
+ gpu::DISABLE_TRANSPARENT_VISUALS);
+ Visual* visual = NULL;
+ int depth = 0;
+ ui::ChooseVisualForWindow(enable_transparent_visuals, &visual, &depth);
+ DCHECK(depth > 0);
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ switches::kWindowDepth, base::IntToString(depth));
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ switches::kX11VisualID, base::UintToString(visual->visualid));
+#endif
+
#if !defined(GOOGLE_CHROME_BUILD) || defined(OS_ANDROID)
// Single-process is an unsupported and not fully tested mode, so
// don't enable it for official Chrome builds (except on Android).
@@ -1385,20 +1402,6 @@ bool BrowserMainLoop::InitializeToolkit() {
LOG(ERROR) << "Unable to open X display.";
return false;
}
-
-#if !defined(OS_CHROMEOS)
- // InitializeToolkit is called before CreateStartupTasks which one starts the
- // gpu process.
- Visual* visual = NULL;
- int depth = 0;
- ui::ChooseVisualForWindow(&visual, &depth);
- DCHECK(depth > 0);
- base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kWindowDepth, base::IntToString(depth));
- base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kX11VisualID, base::UintToString(visual->visualid));
-#endif
-
#endif
// Env creates the compositor. Aura widgets need the compositor to be created
« no previous file with comments | « no previous file | content/test/gpu/page_sets/gpu_process_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698