1 files changed, 1 insertions, 16 deletions
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp
index 10400fa74..95aa8c98b 100644
--- a/src/compositor/wayland_wrapper/qwlsurface.cpp
+++ b/src/compositor/wayland_wrapper/qwlsurface.cpp
@@ -134,7 +134,6 @@ Surface::Surface(struct wl_client *client, uint32_t id, int version, QWaylandCom
 
 Surface::~Surface()
 {
-    removeFromOutput();
     delete m_subSurface;
 
     m_bufferRef = QWaylandBufferRef();
@@ -166,7 +165,7 @@ Surface *Surface::fromResource(struct ::wl_resource *resource)
 
 bool Surface::mapped() const
 {
-    return !m_unmapLocks.isEmpty() || (m_buffer && bool(m_buffer->waylandBufferHandle()));
+    return m_buffer && bool(m_buffer->waylandBufferHandle());
 }
 
 QSize Surface::size() const
@@ -306,20 +305,6 @@ void Surface::setMapped(bool mapped)
     }
 }
 
-void Surface::addUnmapLock(QWaylandUnmapLock *l)
-{
-    m_unmapLocks << l;
-}
-
-void Surface::removeUnmapLock(QWaylandUnmapLock *l)
-{
-    m_unmapLocks.removeOne(l);
-    if (!mapped() && m_attacher) {
-        setSize(QSize());
-        m_attacher->unmap();
-    }
-}
-
 SurfaceBuffer *Surface::createSurfaceBuffer(struct ::wl_resource *buffer)
 {
     SurfaceBuffer *newBuffer = 0;