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

Unified Diff: ui/base/x/x11_util.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: check for _CHROMIUM_INSIDE_XVFB var to relax unit test 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
Index: ui/base/x/x11_util.cc
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
index e8b301d55c9e2c0234610d34fede22800ced5299..98ee35bdb8a8fdb4815cfd5266624c675cd69910 100644
--- a/ui/base/x/x11_util.cc
+++ b/ui/base/x/x11_util.cc
@@ -58,11 +58,6 @@
#include "ui/gfx/skia_util.h"
#include "ui/gfx/x/x11_error_tracker.h"
-#if !defined(OS_CHROMEOS)
-#include "base/command_line.h"
-#include "ui/gfx/x/x11_switches.h"
-#endif
-
#if defined(OS_FREEBSD)
#include <sys/sysctl.h>
#include <sys/types.h>
@@ -1417,7 +1412,9 @@ void LogErrorEventDescription(XDisplay* dpy,
}
#if !defined(OS_CHROMEOS)
-void ChooseVisualForWindow(Visual** visual, int* depth) {
+void ChooseVisualForWindow(bool disable_transparent_visuals,
Corentin Wallez 2016/07/07 00:09:23 nit: making this enable_transparent_visuals would
Julien Isorce Samsung 2016/07/07 10:29:23 Done
+ Visual** visual,
+ int* depth) {
static Visual* s_visual = NULL;
static int s_depth = 0;
@@ -1425,8 +1422,7 @@ void ChooseVisualForWindow(Visual** visual, int* depth) {
XDisplay* display = gfx::GetXDisplay();
XAtom NET_WM_CM_S0 = XInternAtom(display, "_NET_WM_CM_S0", False);
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableTransparentVisuals) &&
+ if (!disable_transparent_visuals &&
XGetSelectionOwner(display, NET_WM_CM_S0) != None) {
// Choose the first ARGB8888 visual
XVisualInfo visual_template;
@@ -1439,12 +1435,6 @@ void ChooseVisualForWindow(Visual** visual, int* depth) {
// Why support only 8888 ARGB? Because it's all that GTK+ supports. In
// gdkvisual-x11.cc, they look for this specific visual and use it for
// all their alpha channel using needs.
- //
- // TODO(erg): While the following does find a valid visual, some GL
- // drivers
- // don't believe that this has an alpha channel. According to marcheu@,
- // this should work on open source driver though. (It doesn't work with
- // NVidia's binaries currently.) http://crbug.com/369209
const XVisualInfo& info = visual_list[i];
if (info.depth == 32 && info.visual->red_mask == 0xff0000 &&
info.visual->green_mask == 0x00ff00 &&

Powered by Google App Engine
This is Rietveld 408576698