Add a mechanism to delay unmapping of surfaces

When a client attachs a NULL buffer on a surface we may want to hang on
to the old buffer for a bit, e.g. to do a hide animation.
Add the QWaylandUnmapLock class to keep a surface mapped after an attach(0)
request.

Change-Id: I5d5be0b36410a76a58d2b68c1b2ac5e3b875a801
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

1 files changed, 9 insertions, 13 deletions

diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index ef78c8849..c8edcb6bc 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -73,19 +73,12 @@ public:
 
     void createTexture()
     {
-        if (bufferRef)
-            bufferRef.destroyTexture();
         bufferRef = nextBuffer;
+        delete texture;
+        texture = 0;
 
         QQuickWindow *window = static_cast<QQuickWindow *>(surface->mainOutput()->window());
-
-        // If the next buffer is NULL do not delete the current texture. If the client called
-        // attach(0) the surface is going to be unmapped anyway, if instead the client attached
-        // a valid buffer but died before we got here we want to keep the old buffer around
-        // in case some destroy animation is run.
-        if (bufferRef) {
-            delete texture;
-
+        if (nextBuffer) {
             if (bufferRef.isShm()) {
                 texture = window->createTextureFromImage(bufferRef.image());
             } else {
@@ -101,6 +94,12 @@ public:
         update = false;
     }
 
+    void unmap() Q_DECL_OVERRIDE
+    {
+        nextBuffer = QWaylandBufferRef();
+        update = true;
+    }
+
     void invalidateTexture()
     {
         if (bufferRef)
@@ -141,9 +140,6 @@ public:
 
     void surface_commit(Resource *resource) Q_DECL_OVERRIDE
     {
-        if (m_pending.newlyAttached) {
-            buffer->update = true;
-        }
         QWaylandSurfacePrivate::surface_commit(resource);
 
         Q_FOREACH (QtWayland::Output *output, outputs())