Expose in a virtual function that surfaces are being destroyed

Change-Id: I979e7d9ca7152d4db6c3e7adae8353935a05d6c5
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>

2 files changed, 2 insertions, 1 deletions

diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp
index 27378f19f..1e1765b11 100644
--- a/src/compositor/wayland_wrapper/wlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/wlcompositor.cpp
@@ -254,6 +254,7 @@ void Compositor::surfaceDestroyed(Surface *surface)
     m_dirty_surfaces.remove(surface);
     if (m_directRenderSurface == surface)
         setDirectRenderSurface(0);
+    waylandCompositor()->surfaceAboutToBeDestroyed(surface->waylandSurface());
 }
 
 void Compositor::markSurfaceAsDirty(Wayland::Surface *surface)
diff --git a/src/compositor/wayland_wrapper/wlsurface.cpp b/src/compositor/wayland_wrapper/wlsurface.cpp
index 72cc45ad9..5d6584935 100644
--- a/src/compositor/wayland_wrapper/wlsurface.cpp
+++ b/src/compositor/wayland_wrapper/wlsurface.cpp
@@ -68,6 +68,7 @@ namespace Wayland {
 void destroy_surface(struct wl_resource *resource)
 {
     Surface *surface = wayland_cast<Surface *>((wl_surface *)resource);
+    surface->compositor()->surfaceDestroyed(surface);
     delete surface;
 }
 
@@ -88,7 +89,6 @@ Surface::Surface(struct wl_client *client, uint32_t id, Compositor *compositor)
 
 Surface::~Surface()
 {
-    m_compositor->surfaceDestroyed(this);
     delete m_waylandSurface;
 }