Fix Z-order for a bubble when it appears for inactive window.

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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.
 
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 #include <X11/extensions/shape.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xregion.h>
@@ skipping 110 matching lines @@
   "XdndProxy",  // Proxy windows?
   "XdndSelection",
   "XdndStatus",
   "XdndTypeList",
   NULL
 };
 
 const char kX11WindowRolePopup[] = "popup";
 const char kX11WindowRoleBubble[] = "bubble";
 
+// Returns the whole path from |window| to the root.
+std::vector<::Window> GetParentsList(XDisplay* xdisplay, ::Window window) {
+  ::Window parent_win, root_win;
+  Window* child_windows;
+  unsigned int num_child_windows;
+  std::vector<::Window> result;
+
+  while (window) {
+    result.push_back(window);
+    if (!XQueryTree(xdisplay, window,
+                    &root_win, &parent_win, &child_windows, &num_child_windows))

[Elliot Glaysher, 2015/06/05 22:03:01]

Doing a whole query tree here seems a bit unfortunate.

[vasilii, 2015/06/08 09:14:37]

I don't see another function to get a parent.

+      break;
+    if (child_windows)
+      XFree(child_windows);
+    window = parent_win;
+  }
+  return result;
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostX11, public:
 
 DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura)
     : xdisplay_(gfx::GetXDisplay()),
       xwindow_(0),
@@ skipping 267 matching lines @@
   bool size_changed = bounds_in_pixels_.size() != size_in_pixels;
   XResizeWindow(xdisplay_, xwindow_, size_in_pixels.width(),
                 size_in_pixels.height());
   bounds_in_pixels_.set_size(size_in_pixels);
   if (size_changed) {
     OnHostResized(size_in_pixels);
     ResetWindowRegion();
   }
 }
 
+void DesktopWindowTreeHostX11::StackAbove(aura::Window* window) {
+  if (window && window->GetRootWindow()) {
+    ::Window window_below = window->GetHost()->GetAcceleratedWidget();
+    // Find all parent windows up to the root.
+    std::vector<::Window> window_below_parents =
+        GetParentsList(xdisplay_, window_below);
+    std::vector<::Window> window_above_parents =
+        GetParentsList(xdisplay_, xwindow_);
+
+    // Find their common ancestor.
+    auto it_below_window = window_below_parents.rbegin();
+    auto it_above_window = window_above_parents.rbegin();
+    for (; it_below_window != window_below_parents.rend() &&
+           it_above_window != window_above_parents.rend() &&
+           *it_below_window == *it_above_window;
+         ++it_below_window, ++it_above_window) {
+    }
+
+    if (it_below_window != window_below_parents.rend() &&
+        it_above_window != window_above_parents.rend()) {
+      // First stack |xwindow_| below so Z-order of |window| stays the same.
+      ::Window windows[] = {*it_below_window, *it_above_window};
+      if (XRestackWindows(xdisplay_, windows, 2) == 0) {
+        // Now stack them properly.
+        std::swap(windows[0], windows[1]);
+        XRestackWindows(xdisplay_, windows, 2);
+      }
+    }
+  }
+}
+
 void DesktopWindowTreeHostX11::StackAtTop() {
   XRaiseWindow(xdisplay_, xwindow_);
 }
 
 void DesktopWindowTreeHostX11::CenterWindow(const gfx::Size& size) {
   gfx::Size size_in_pixels = ToPixelRect(gfx::Rect(size)).size();
   gfx::Rect parent_bounds_in_pixels = GetWorkAreaBoundsInPixels();
 
   // If |window_|'s transient parent bounds are big enough to contain |size|,
   // use them instead.
@@ skipping 1571 matching lines @@
   if (linux_ui) {
     ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
     if (native_theme)
       return native_theme;
   }
 
   return ui::NativeTheme::instance();
 }
 
 }  // namespace views