Remove the default shell functionality

This will be readded in a different way. Also, remove the
WaylandSurfaceChrome since it is no longer needed, and just use
WaylandView directly

Change-Id: I8d4a7b2135d9fdaea7dd3fcd729e55cceebf48fb

4 files changed, 7 insertions, 28 deletions

diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h
index d21659013..c8b95bbd7 100644
--- a/src/compositor/compositor_api/qwaylandcompositor.h
+++ b/src/compositor/compositor_api/qwaylandcompositor.h
@@ -88,7 +88,6 @@ public:
         SubSurfaceExtension = 0x10,
         TextInputExtension = 0x20,
         HardwareIntegrationExtension = 0x40,
-        DefaultShellExtension = 0x80,
 
         DefaultExtensions = WindowManagerExtension | SurfaceExtension | QtKeyExtension | TouchExtension | HardwareIntegrationExtension
     };
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 983c390f5..e8ff9c927 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE
 QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent)
     : QWaylandCompositor(parent)
     , m_initializeLegazyQmlNames(true)
-    , m_exposeDefaultShell(false)
 {
 }
 
@@ -60,11 +59,6 @@ void QWaylandQuickCompositor::create()
     if (m_initializeLegazyQmlNames)
         registerLegacyQmlNames();
 
-    if (m_exposeDefaultShell)
-        setExtensionFlags(extensionFlags() | QWaylandCompositor::DefaultShellExtension);
-    else
-        setExtensionFlags(extensionFlags() & !QWaylandCompositor::DefaultShellExtension);
-
     QWaylandCompositor::create();
 }
 
@@ -92,18 +86,6 @@ void QWaylandQuickCompositor::setInitializeLegazyQmlNames(bool init)
     m_initializeLegazyQmlNames = init;
 }
 
-bool QWaylandQuickCompositor::exposeDefaultShell() const
-{
-    return m_exposeDefaultShell;
-}
-
-void QWaylandQuickCompositor::setExposeDefaultShell(bool defaultShell)
-{
-    if (isCreated())
-        qWarning() << Q_FUNC_INFO << "modifying exposeDefaultShell after the compositor is created is not supported";
-    m_exposeDefaultShell = defaultShell;
-}
-
 QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outputSpace,
                                                       QWindow *window,
                                                       const QString &manufacturer,
@@ -131,9 +113,6 @@ void QWaylandQuickCompositor::classBegin()
 
 void QWaylandQuickCompositor::componentComplete()
 {
-    //if (m_exposeDefaultShell)
-        //addDefaultShell();
-
 }
 
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h
index c415a4b84..60bf0de97 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.h
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.h
@@ -51,7 +51,6 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, p
     Q_INTERFACES(QQmlParserStatus)
     Q_OBJECT
     Q_PROPERTY(bool initializeLegazyQmlNames READ initializeLegazyQmlNames WRITE setInitializeLegazyQmlNames)
-    Q_PROPERTY(bool exposeDefaultShell READ exposeDefaultShell WRITE setExposeDefaultShell)
 public:
     QWaylandQuickCompositor(QObject *parent = 0);
     void create() Q_DECL_OVERRIDE;
@@ -60,9 +59,6 @@ public:
     bool initializeLegazyQmlNames() const;
     void setInitializeLegazyQmlNames(bool init);
 
-    bool exposeDefaultShell() const;
-    void setExposeDefaultShell(bool defaultShell);
-
     QWaylandOutput *createOutput(QWaylandOutputSpace *outputSpace,
                                  QWindow *window,
                                  const QString &manufacturer,
@@ -75,7 +71,6 @@ protected:
 
 private:
     bool m_initializeLegazyQmlNames;
-    bool m_exposeDefaultShell;
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandview.cpp b/src/compositor/compositor_api/qwaylandview.cpp
index 4970de26f..f83948302 100644
--- a/src/compositor/compositor_api/qwaylandview.cpp
+++ b/src/compositor/compositor_api/qwaylandview.cpp
@@ -53,8 +53,8 @@ void QWaylandViewPrivate::markSurfaceAsDestroyed(QWaylandSurface *surface)
     Q_Q(QWaylandView);
     Q_ASSERT(surface == this->surface);
 
-    q->waylandSurfaceDestroyed();
     q->setSurface(Q_NULLPTR);
+    q->waylandSurfaceDestroyed();
 }
 
 QWaylandView::QWaylandView()
@@ -86,6 +86,12 @@ QWaylandSurface *QWaylandView::surface() const
 void QWaylandView::setSurface(QWaylandSurface *newSurface)
 {
     Q_D(QWaylandView);
+    if (d->surface == newSurface)
+        return;
+
+    if (!d->output && newSurface && !d->surface)
+        setOutput(newSurface->primaryOutput());
+
     QWaylandSurface *oldSurface = d->surface;
     d->surface = newSurface;