Rework how we manage extensions

Change-Id: If2cbf096e7419bc1bda007d5167ce39d1a5d50ae

1 files changed, 5 insertions, 21 deletions

diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index 96e9ca484..ffa8f437f 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -38,7 +38,6 @@
 #include <QOpenGLTexture>
 #include <QQuickWindow>
 #include <QDebug>
-#include <QQmlPropertyMap>
 
 #include "qwaylandquicksurface.h"
 #include "qwaylandquickcompositor.h"
@@ -47,6 +46,9 @@
 #include <QtCompositor/qwaylandbufferref.h>
 #include <QtCompositor/private/qwaylandsurface_p.h>
 
+#include <QtCompositor/private/qwayland-server-surface-extension.h>
+#include <QtCompositor/private/qwlextendedsurface_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QWaylandQuickSurfacePrivate : public QWaylandSurfacePrivate
@@ -56,14 +58,12 @@ public:
         : QWaylandSurfacePrivate(client, id, version, c, surf)
         , compositor(c)
         , useTextureAlpha(true)
-        , windowPropertyMap(new QQmlPropertyMap)
         , clientRenderingEnabled(true)
     {
     }
 
     ~QWaylandQuickSurfacePrivate()
     {
-        windowPropertyMap->deleteLater();
     }
 
     void surface_commit(Resource *resource) Q_DECL_OVERRIDE
@@ -78,18 +78,13 @@ public:
 
     QWaylandQuickCompositor *compositor;
     bool useTextureAlpha;
-    QQmlPropertyMap *windowPropertyMap;
     bool clientRenderingEnabled;
 };
 
 QWaylandQuickSurface::QWaylandQuickSurface(wl_client *client, quint32 id, int version, QWaylandQuickCompositor *compositor)
                     : QWaylandSurface(new QWaylandQuickSurfacePrivate(client, id, version, compositor, this))
 {
-    Q_D(QWaylandQuickSurface);
-    connect(this, &QWaylandSurface::shellViewCreated, this, &QWaylandQuickSurface::shellViewCreated);
     connect(this, &QWaylandSurface::primaryOutputChanged, this, &QWaylandQuickSurface::primaryOutputWindowChanged);
-    connect(this, &QWaylandSurface::windowPropertyChanged, d->windowPropertyMap, &QQmlPropertyMap::insert);
-    connect(d->windowPropertyMap, &QQmlPropertyMap::valueChanged, this, &QWaylandSurface::setWindowProperty);
 
     connect(this, &QWaylandSurface::windowPropertyChanged, d->windowPropertyMap, &QQmlPropertyMap::insert);
     connect(d->windowPropertyMap, &QQmlPropertyMap::valueChanged, this, &QWaylandSurface::setWindowProperty);
@@ -117,17 +112,6 @@ void QWaylandQuickSurface::setUseTextureAlpha(bool useTextureAlpha)
     }
 }
 
-QObject *QWaylandQuickSurface::windowPropertyMap() const
-{
-    Q_D(const QWaylandQuickSurface);
-    return d->windowPropertyMap;
-}
-
-QWaylandSurfaceItem *QWaylandQuickSurface::shellView() const
-{
-    return static_cast<QWaylandSurfaceItem *>(QWaylandSurface::shellView());
-}
-
 QWindow *QWaylandQuickSurface::primaryOutputWindow() const
 {
     return primaryOutput() ? primaryOutput()->window() : Q_NULLPTR;
@@ -185,8 +169,8 @@ void QWaylandQuickSurface::setClientRenderingEnabled(bool enabled)
     if (d->clientRenderingEnabled != enabled) {
         d->clientRenderingEnabled = enabled;
 
-        sendOnScreenVisibilityChange(enabled);
-
+        if (QWaylandExtension *extension = this->extension(QtWaylandServer::qt_extended_surface::name()))
+            static_cast<QtWayland::ExtendedSurface*>(extension)->setVisibility(enabled ? QWindow::AutomaticVisibility : QWindow::Hidden);
         emit clientRenderingEnabledChanged();
     }
 }