Destroy the SurfaceBuffers and their textures after the wl_buffer are destroyed

A SurfaceBuffer can live after its wl_buffer died, so make sure to delete
it when there is no surface or buffer reference that points to it anymore.

Change-Id: Id90453c74d14ca1414cb837b355430a510d5f07e
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/compositor/compositor_api/qwaylandbufferref.cpp b/src/compositor/compositor_api/qwaylandbufferref.cpp
index 67554c7cb..e77b14be2 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.cpp
+++ b/src/compositor/compositor_api/qwaylandbufferref.cpp
@@ -64,7 +64,7 @@ QWaylandBufferRef::QWaylandBufferRef(QtWayland::SurfaceBuffer *buffer)
 {
     d->buffer = buffer;
     if (buffer)
-        buffer->m_refCount.ref();
+        buffer->ref();
 }
 
 QWaylandBufferRef::QWaylandBufferRef(const QWaylandBufferRef &ref)
@@ -76,19 +76,19 @@ QWaylandBufferRef::QWaylandBufferRef(const QWaylandBufferRef &ref)
 
 QWaylandBufferRef::~QWaylandBufferRef()
 {
-    if (d->buffer && !d->buffer->m_refCount.deref())
-        d->buffer->disown();
+    if (d->buffer)
+        d->buffer->deref();
     delete d;
 }
 
 QWaylandBufferRef &QWaylandBufferRef::operator=(const QWaylandBufferRef &ref)
 {
-    if (d->buffer && !d->buffer->m_refCount.deref())
-        d->buffer->disown();
+    if (d->buffer)
+        d->buffer->deref();
 
     d->buffer = ref.d->buffer;
     if (d->buffer)
-        d->buffer->m_refCount.ref();
+        d->buffer->ref();
 
     return *this;
 }