[mutter/wayland] window-actor: Kill off a nonsensical edge case



commit 0dccc440b692b7dc4d891295d9138892bf0d7aad
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Feb 18 23:36:46 2014 -0500

    window-actor: Kill off a nonsensical edge case
    
    We can never have a window actor that represents either the X root
    window or the stage window, so it doesn't make sense to bail out
    early in case we do.
    
    I'd imagine that this came from a much earlier version of the code
    where the compositor was much separate and had its own MapNotify
    handling.

 src/compositor/meta-window-actor.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index f0cbc0c..be2514e 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -1684,20 +1684,14 @@ cullable_iface_init (MetaCullableInterface *iface)
 static void
 check_needs_x11_pixmap (MetaWindowActor *self)
 {
-  MetaWindowActorPrivate *priv     = self->priv;
-  MetaScreen          *screen   = priv->screen;
-  MetaDisplay         *display  = meta_screen_get_display (screen);
-  Display             *xdisplay = meta_display_get_xdisplay (display);
-  MetaCompScreen      *info     = meta_screen_get_compositor_data (screen);
-  Window               xwindow  = meta_window_get_toplevel_xwindow (priv->window);
+  MetaWindowActorPrivate *priv = self->priv;
+  MetaDisplay *display = meta_screen_get_display (screen);
+  Display *xdisplay = meta_display_get_xdisplay (display);
+  Window xwindow  = meta_window_get_toplevel_xwindow (priv->window);
 
   if (!priv->needs_pixmap)
     return;
 
-  if (xwindow == meta_screen_get_xroot (screen) ||
-      xwindow == clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage)))
-    return;
-
   if (priv->x11_size_changed)
     {
       meta_window_actor_detach_x11_pixmap (self);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]