[gtk+/gtk-3-22] wayland: Check for subsurface looking up the toplevel

[Olivier Fourdan <ofourdan src gnome org>]

commit 57a14565c649a83d37060b63a6edd39aea150b40
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Tue Nov 29 14:21:57 2016 +0100

    wayland: Check for subsurface looking up the toplevel
    
    gdk_window_get_toplevel() walks up the windows tree looking for the
    corresponding toplevel window, but needs to account for subsurfaces as
    well on Wayland.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=775319

 gdk/gdkwindow.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 1d5baf2..5267b70 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2454,7 +2454,8 @@ gdk_window_get_toplevel (GdkWindow *window)
 {
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
-  while (window->window_type == GDK_WINDOW_CHILD)
+  while (window->window_type == GDK_WINDOW_CHILD ||
+         window->window_type == GDK_WINDOW_SUBSURFACE)
     {
       if (gdk_window_is_toplevel (window))
        break;