Fix missing shadows for tooltip and menu

ui/base/x/x11_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 1397 matching lines @@
       << " (" << error_str << "), "
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 #if !defined(OS_CHROMEOS)
 void ChooseVisualForWindow(bool enable_transparent_visuals,
                            Visual** visual,
                            int* depth) {
-  static Visual* s_visual = NULL;
-  static int s_depth = 0;
+  static Visual* s_default_visual = NULL;
+  static Visual* s_transparent_visual = NULL;
+  static int s_default_depth = 0;
+  static int s_transparent_depth = 0;
 
-  if (!s_visual) {
+  if (!s_default_visual || !s_transparent_visual) {
     XDisplay* display = gfx::GetXDisplay();
     XAtom NET_WM_CM_S0 = XInternAtom(display, "_NET_WM_CM_S0", False);
 
     if (enable_transparent_visuals &&
         XGetSelectionOwner(display, NET_WM_CM_S0) != None) {
       // Choose the first ARGB8888 visual
       XVisualInfo visual_template;
       visual_template.screen = 0;
 
       int visuals_len;
       gfx::XScopedPtr<XVisualInfo[]> visual_list(XGetVisualInfo(
           display, VisualScreenMask, &visual_template, &visuals_len));
       for (int i = 0; i < visuals_len; ++i) {
         // 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.
         const XVisualInfo& info = visual_list[i];
         if (info.depth == 32 && info.visual->red_mask == 0xff0000 &&
             info.visual->green_mask == 0x00ff00 &&
             info.visual->blue_mask == 0x0000ff) {
-          s_visual = info.visual;
-          s_depth = info.depth;
+          s_transparent_visual = info.visual;
+          s_transparent_depth = info.depth;
+          DCHECK(s_transparent_visual);
           break;
         }
       }
-    } else {
-      XWindowAttributes windowAttribs;
-      Window root = XDefaultRootWindow(display);
-      Status status = XGetWindowAttributes(display, root, &windowAttribs);
-      DCHECK(status != 0);
-      s_visual = windowAttribs.visual;
-      s_depth = windowAttribs.depth;
     }
-  }  // !s_visual
 
-  DCHECK(s_visual);
-  DCHECK(s_depth > 0);
+    XWindowAttributes windowAttribs;

[sadrul, 2016/09/02 19:53:24]

window_attribs, or attribs.

Sorry, missed this in earlier iteration.

[Julien Isorce Samsung, 2016/09/02 20:59:08]

My fault, thx.

+    Window root = XDefaultRootWindow(display);
+    Status status = XGetWindowAttributes(display, root, &windowAttribs);
+    DCHECK(status != 0);
+    s_default_visual = windowAttribs.visual;
+    s_default_depth = windowAttribs.depth;
+
+    if (!s_transparent_visual) {
+      s_transparent_visual = s_default_visual;
+      s_transparent_depth = s_default_depth;
+    }
+  }  // !s_default_visual || !s_transparent_visual
+
+  DCHECK(s_default_visual);
+  DCHECK(s_default_depth > 0);
+  DCHECK(s_transparent_visual);
+  DCHECK(s_transparent_depth > 0);
 
   if (visual)
-    *visual = s_visual;
+    *visual =
+        enable_transparent_visuals ? s_transparent_visual : s_default_visual;
   if (depth)
-    *depth = s_depth;
+    *depth = enable_transparent_visuals ? s_transparent_depth : s_default_depth;
 }
 #endif
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui