[gtk/wip/matthiasc/popup5: 123/124] wayland: merge errors

[Matthias Clasen <matthiasc src gnome org>]

commit 06a82670e6542437459cb4e0905765b5ec998f62
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 19 03:40:42 2019 +0000

    wayland: merge errors

 gdk/wayland/gdksurface-wayland.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 88dd043881..6d670697cb 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -243,13 +243,6 @@ _gdk_wayland_surface_clear_saved_size (GdkSurface *surface)
   impl->saved_height = -1;
 }
 
-/*
- * gdk_wayland_surface_update_size:
- * @drawable: a #GdkDrawableImplWayland.
- *
- * Updates the state of the drawable (in particular the drawable's
- * cairo surface) when its size has changed.
- */
 static void
 gdk_wayland_surface_update_size (GdkSurface *surface,
                                  int32_t     width,
@@ -2587,7 +2580,7 @@ static void
 gdk_wayland_surface_destroy_surface (GdkSurface *surface)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
-  GdkSurfaceImplWayland *impl = GDK_SURFACE_IMPL_WAYLAND (surface->impl);
+  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
 
   if (impl->display_server.wl_surface)
     {