[mutter] wayland: Remove the explicit surface commit for Xwayland



commit 62e5faeb0c866f24a5549b1bd9f6470d1332a8d8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Apr 11 23:45:38 2014 -0700

    wayland: Remove the explicit surface commit for Xwayland
    
    It's not needed anymore; we always keep the actor up-to-date.

 src/wayland/meta-wayland-surface-private.h |   32 ----------------------------
 src/wayland/meta-wayland-surface.c         |    3 +-
 src/wayland/meta-xwayland.c                |    8 -------
 3 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 53c4844..b7d1b1b 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -48,7 +48,6 @@
 #include "meta-wayland-keyboard.h"
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-data-device.h"
-#include "meta-wayland-surface-private.h"
 
 #include "meta-cursor-tracker-private.h"
 #include "display-private.h"
@@ -354,7 +353,7 @@ commit_double_buffered_state (MetaWaylandSurface             *surface,
   double_buffered_state_reset (pending);
 }
 
-void
+static void
 meta_wayland_surface_commit (MetaWaylandSurface *surface)
 {
   commit_double_buffered_state (surface, &surface->pending);
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 856213c..22a77b2 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -26,8 +26,6 @@
 #include "meta-xwayland.h"
 #include "meta-xwayland-private.h"
 
-#include "meta-wayland-surface-private.h"
-
 #include <glib.h>
 #include <glib-unix.h>
 #include <unistd.h>
@@ -57,12 +55,6 @@ associate_window_with_surface (MetaWindow         *window,
 
   meta_compositor_window_surface_changed (display->compositor, window);
 
-  /* Since the association comes in the form of a ClientMessage,
-   * we have no way to know when the surface was set up. Since
-   * commit just breaks if we don't have a window associated with
-   * it, we need to do a commit *again* here. */
-  meta_wayland_surface_commit (surface);
-
   /* Now that we have a surface check if it should have focus. */
   meta_display_sync_wayland_input_focus (display);
 }


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