From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 23 Aug 2017 11:49:04 +0000 (-0400)
Subject: Drop foreign window checks in Broadway
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~927
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4a2dc53a76b91b80c745fbc1937e715b19b29c60;p=gtk4.git

Drop foreign window checks in Broadway

The broadway backen never creates foreign windows,
so no need to check for this type of window.
---

diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 0c73434de7..1fd37c96e5 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -46,13 +46,9 @@ static void        gdk_window_impl_broadway_finalize   (GObject            *obje
 
 static const cairo_user_data_key_t gdk_broadway_cairo_key;
 
-#define WINDOW_IS_TOPLEVEL_OR_FOREIGN(window) \
+#define WINDOW_IS_TOPLEVEL(window) \
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
 
-#define WINDOW_IS_TOPLEVEL(window)		     \
-  (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
-   GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
-
 struct _GdkBroadwayWindow {
   GdkWindow parent;
 };
@@ -386,12 +382,7 @@ static void
 gdk_broadway_window_destroy_notify (GdkWindow *window)
 {
   if (!GDK_WINDOW_DESTROYED (window))
-    {
-      if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN)
-	g_warning ("GdkWindow %p unexpectedly destroyed", window);
-
-      _gdk_window_destroy (window, TRUE);
-    }
+    _gdk_window_destroy (window, TRUE);
 
   g_object_unref (window);
 }
@@ -795,7 +786,7 @@ gdk_broadway_window_set_icon_name (GdkWindow   *window,
 				   const gchar *name)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   g_object_set_qdata (G_OBJECT (window), g_quark_from_static_string ("gdk-icon-name-set"),
@@ -806,7 +797,7 @@ static void
 gdk_broadway_window_iconify (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 }
 
@@ -814,7 +805,7 @@ static void
 gdk_broadway_window_deiconify (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 }
 
@@ -822,7 +813,7 @@ static void
 gdk_broadway_window_stick (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
 }
@@ -831,7 +822,7 @@ static void
 gdk_broadway_window_unstick (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
 }
@@ -845,7 +836,7 @@ gdk_broadway_window_maximize (GdkWindow *window)
   GdkRectangle geom;
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
@@ -877,7 +868,7 @@ gdk_broadway_window_unmaximize (GdkWindow *window)
   GdkWindowImplBroadway *impl;
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
@@ -900,7 +891,7 @@ static void
 gdk_broadway_window_fullscreen (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
 }
@@ -909,7 +900,7 @@ static void
 gdk_broadway_window_unfullscreen (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
 }
@@ -921,7 +912,7 @@ gdk_broadway_window_set_keep_above (GdkWindow *window,
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
 }
@@ -932,7 +923,7 @@ gdk_broadway_window_set_keep_below (GdkWindow *window, gboolean setting)
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
 }
@@ -958,7 +949,7 @@ gdk_broadway_window_set_decorations (GdkWindow      *window,
 				     GdkWMDecoration decorations)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
 }
@@ -970,7 +961,7 @@ gdk_broadway_window_get_decorations (GdkWindow       *window,
   gboolean result = FALSE;
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return FALSE;
 
   return result;
@@ -983,7 +974,7 @@ gdk_broadway_window_set_functions (GdkWindow    *window,
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 }
 
@@ -1372,7 +1363,7 @@ gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
   impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   if (impl->maximized)
@@ -1412,7 +1403,7 @@ gdk_broadway_window_begin_move_drag (GdkWindow *window,
   impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   if (impl->maximized)