Merge lp:~gerboland/unity-mir/fix-compatibility-with-mir-0.1.8 into lp:unity-mir

[Gerry Boland]

Mir 0.1.8 refactoring allows removal of custom SurfaceFactory and instead use InitialSurfacePlacementStrategy to set surface depth and other properties. The shell surface notification now comes via SessionListener

* Are there any related MPs required for this MP to build/function as expected? https://code.launchpad.net/~gerboland/platform-api/fix-compatibility-with-mir-0.1.8/+merge/215257

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/316/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/179/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/316/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gerboland/unity-mir/fix-compatibility-with-mir-0.1.8]

212. By Gerry Boland on 2014-04-14

place() can be called by several threads, so use locking around mainShellSurfaceFound. Standardize code style.

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-03-31 15:12:18 +0000
+++ debian/control	2014-04-10 17:06:34 +0000
@@ -9,8 +9,8 @@
                libboost-dev,
                libboost-system-dev,
                libplatform-api1-dev,
-               libmirserver-dev (>= 0.1.7),
-               libmirclient-dev (>= 0.1.7),
+               libmirserver-dev (>= 0.1.8),
+               libmirclient-dev (>= 0.1.8),
                libprocess-cpp-dev,
                libunity-api-dev (>= 7.80.6),
                libupstart-app-launch2-dev,
@@ -49,8 +49,8 @@
          ${shlibs:Depends},
          libunity-mir1 (= ${binary:Version}),
          libupstart-app-launch2-dev,
-         libmirserver-dev (>= 0.0.11),
-         libmirclient-dev (>= 0.0.11),
+         libmirserver-dev (>= 0.1.8),
+         libmirclient-dev (>= 0.1.8),
          libplatform-api1-dev,
          qtbase5-dev,
 Description: Qt plugins for Unity specific Mir APIs - development files

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-04-01 22:49:46 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-04-10 17:06:34 +0000
@@ -29,7 +29,6 @@
 #include "sessionlistener.h"
 #include "sessionauthorizer.h"
 #include "initialsurfaceplacementstrategy.h"
-#include "surfacefactory.h"
 #include "taskcontroller.h"
 #include "logging.h"
 

=== modified file 'src/modules/Unity/Application/inputarea.cpp'
--- src/modules/Unity/Application/inputarea.cpp	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/inputarea.cpp	2014-04-10 17:06:34 +0000
@@ -28,7 +28,6 @@
 // unity-mir
 #include "qmirserverapplication.h"
 #include "shellserverconfiguration.h"
-#include "surfacefactory.h"
 #include "logging.h"
 
 namespace unitymir

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2014-04-10 17:06:34 +0000
@@ -27,14 +27,15 @@
 #include "shellserverconfiguration.h"
 #include "sessionlistener.h"
 #include "surfaceconfigurator.h"
-#include "surfacefactory.h"
 #include "focussetter.h"
 #include "logging.h"
 
 // mir
 #include <mir/shell/session.h>
+#include <mir/scene/surface.h>
 
 namespace msh = mir::shell;
+namespace ms = mir::scene;
 
 namespace unitymir
 {
@@ -63,7 +64,7 @@
     }
     m_mirServer = mirServerApplication->server();
 
-    QObject::connect(m_mirServer->surfaceFactory(), &SurfaceFactory::shellSurfaceCreated,
+    QObject::connect(m_mirServer->sessionListener(), &SessionListener::shellSurfaceCreated,
                      this, &MirSurfaceManager::shellSurfaceCreated);
 
     QObject::connect(m_mirServer->sessionListener(), &SessionListener::sessionCreatedSurface,
@@ -141,7 +142,7 @@
     Q_EMIT shellSurfaceChanged(m_shellSurface);
 }
 
-void MirSurfaceManager::surfaceAttributeChanged(const msh::Surface *surface, const MirSurfaceAttrib attribute, const int value)
+void MirSurfaceManager::surfaceAttributeChanged(const ms::Surface *surface, const MirSurfaceAttrib attribute, const int value)
 {
     DLOG("MirSurfaceManager::surfaceAttributeChanged (this=%p, attrib=%d, value=%d)",
          this, static_cast<int>(attribute), value);

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
--- src/modules/Unity/Application/mirsurfacemanager.h	2014-02-28 16:51:31 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.h	2014-04-10 17:06:34 +0000
@@ -29,6 +29,7 @@
 // local
 #include "mirsurface.h"
 
+namespace mir { namespace scene { class Surface; }}
 namespace mir { namespace shell { class Surface; class Session; }}
 class ShellServerConfiguration;
 
@@ -61,7 +62,7 @@
     void sessionDestroyingSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const&);
     void shellSurfaceCreated(std::shared_ptr<mir::shell::Surface> const&);
 
-    void surfaceAttributeChanged(mir::shell::Surface const*, MirSurfaceAttrib, int);
+    void surfaceAttributeChanged(mir::scene::Surface const*, MirSurfaceAttrib, int);
 
 private:
     QHash<const mir::shell::Surface *, MirSurface *> m_surfaces;

=== modified file 'src/unity-mir/CMakeLists.txt'
--- src/unity-mir/CMakeLists.txt	2014-03-11 03:40:33 +0000
+++ src/unity-mir/CMakeLists.txt	2014-04-10 17:06:34 +0000
@@ -23,7 +23,6 @@
   sessioncreator.h
   sessionlistener.h
   shellserverconfiguration.h
-  surfacefactory.h
   surfaceconfigurator.h
   unityprotobufservice.h
   logging.h
@@ -44,7 +43,6 @@
   sessioncreator.cpp
   sessionlistener.cpp
   shellserverconfiguration.cpp
-  surfacefactory.cpp
   surfaceconfigurator.cpp
   unityprotobufservice.cpp
   focussetter.cpp

=== modified file 'src/unity-mir/initialsurfaceplacementstrategy.cpp'
--- src/unity-mir/initialsurfaceplacementstrategy.cpp	2014-01-14 06:01:40 +0000
+++ src/unity-mir/initialsurfaceplacementstrategy.cpp	2014-04-10 17:06:34 +0000
@@ -23,11 +23,14 @@
 #include "mir/geometry/rectangle.h"
 
 namespace msh = mir::shell;
+namespace msc = mir::scene;
 
-InitialSurfacePlacementStrategy::InitialSurfacePlacementStrategy(std::shared_ptr<msh::DisplayLayout> const& displayLayout, QObject *parent)
+InitialSurfacePlacementStrategy::InitialSurfacePlacementStrategy(
+        std::shared_ptr<msh::DisplayLayout> const& displayLayout, QObject *parent)
   : QObject(parent),
     m_displayLayout(displayLayout)
 {
+    DLOG("InitialSurfacePlacementStrategy::InitialSurfacePlacementStrategy (%p)", this);
 }
 
 InitialSurfacePlacementStrategy::~InitialSurfacePlacementStrategy()
@@ -35,10 +38,32 @@
 }
 
 msh::SurfaceCreationParameters
-InitialSurfacePlacementStrategy::place(msh::Session const& session, msh::SurfaceCreationParameters const& requestParameters)
+InitialSurfacePlacementStrategy::place(msh::Session const& session,
+                                       msh::SurfaceCreationParameters const& requestParameters)
 {
+    DLOG("InitialSurfacePlacementStrategy::place (%p, %s, %d)", this, session.name().c_str(), session.process_id());
     using namespace mir::geometry;
     auto placedParameters = requestParameters;
+
+    // decide surface depth
+    static const msc::DepthId shellSurfaceDepth{1};
+    static const msc::DepthId oskSurfaceDepth{2};
+    static bool mainShellSurfaceFound = false;
+
+    if (session.process_id() == 0 && !mainShellSurfaceFound) {
+        DLOG("Shell main surface found, placed at shell depth");
+        placedParameters.depth = shellSurfaceDepth;
+        placedParameters.input_mode = mir::input::InputReceptionMode::receives_all_input;
+        mainShellSurfaceFound = true;
+        return placedParameters;
+    } else if (placedParameters.name == "MaliitOnScreenKeyboard") { // FIXME: string hardcoded into maliit
+        DLOG("OSK depth");
+        placedParameters.depth = oskSurfaceDepth;
+    } else {
+        DLOG("Default depth");
+    }
+
+    // determine x,y position of the surface by asking shell, if it is up
     uint32_t x = 0;
     uint32_t y = 0;
 

=== modified file 'src/unity-mir/sessionauthorizer.cpp'
--- src/unity-mir/sessionauthorizer.cpp	2013-10-29 10:12:40 +0000
+++ src/unity-mir/sessionauthorizer.cpp	2014-04-10 17:06:34 +0000
@@ -43,3 +43,11 @@
     Q_UNUSED(pid)
     return true;
 }
+
+bool SessionAuthorizer::screencast_is_allowed(pid_t pid)
+{
+    DLOG("SessionAuthorizer::screencast_is_allowed (this=%p, pid=%d)", this, pid);
+    Q_UNUSED(pid)
+    return true;
+}
+

=== modified file 'src/unity-mir/sessionauthorizer.h'
--- src/unity-mir/sessionauthorizer.h	2013-10-29 10:12:40 +0000
+++ src/unity-mir/sessionauthorizer.h	2014-04-10 17:06:34 +0000
@@ -36,6 +36,7 @@
 
     virtual bool connection_is_allowed(pid_t pid) override;
     virtual bool configure_display_is_allowed(pid_t pid) override;
+    virtual bool screencast_is_allowed(pid_t pid) override;
 
 Q_SIGNALS:
     // needs to be blocked queued signal which returns value for authorized

=== modified file 'src/unity-mir/sessionlistener.cpp'
--- src/unity-mir/sessionlistener.cpp	2013-11-20 14:39:50 +0000
+++ src/unity-mir/sessionlistener.cpp	2014-04-10 17:06:34 +0000
@@ -17,6 +17,8 @@
 #include "sessionlistener.h"
 #include "logging.h"
 
+#include <mir/shell/session.h>
+
 namespace msh = mir::shell;
 
 Q_DECLARE_METATYPE(std::shared_ptr<msh::Session>)
@@ -27,6 +29,7 @@
     DLOG("SessionListener::SessionListener (this=%p)", this);
     // need to register type to send over threads with signal/slot
     qRegisterMetaType<std::shared_ptr<msh::Session>>("std::shared_ptr<mir::shell::Session>");
+    qRegisterMetaType<std::shared_ptr<msh::Surface>>("std::shared_ptr<mir::shell::Surface>");
 }
 
 SessionListener::~SessionListener()
@@ -63,7 +66,13 @@
 void SessionListener::surface_created(msh::Session& session, std::shared_ptr<msh::Surface> const& surface)
 {
     DLOG("SessionListener::surface_created (this=%p, session=%p, surface=%p)", this, &session, (void*)surface.get());
-    Q_EMIT sessionCreatedSurface(&session, surface);
+    static bool mainShellSurfaceFound = false;
+    if (session.process_id() == 0 && !mainShellSurfaceFound) {
+        Q_EMIT shellSurfaceCreated(surface);
+        mainShellSurfaceFound = true;
+    } else {
+        Q_EMIT sessionCreatedSurface(&session, surface);
+    }
 }
 
 void SessionListener::destroying_surface(msh::Session& session, std::shared_ptr<mir::shell::Surface> const& surface)

=== modified file 'src/unity-mir/sessionlistener.h'
--- src/unity-mir/sessionlistener.h	2013-11-15 17:40:27 +0000
+++ src/unity-mir/sessionlistener.h	2014-04-10 17:06:34 +0000
@@ -44,6 +44,8 @@
 
     void sessionCreatedSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const&);
     void sessionDestroyingSurface(mir::shell::Session const*, std::shared_ptr<mir::shell::Surface> const&);
+
+    void shellSurfaceCreated(std::shared_ptr<mir::shell::Surface> const&);
 };
 
 #endif // SESSIONLISTENER_H

=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
--- src/unity-mir/shellserverconfiguration.cpp	2014-02-19 23:28:21 +0000
+++ src/unity-mir/shellserverconfiguration.cpp	2014-04-10 17:06:34 +0000
@@ -23,13 +23,13 @@
 #include "sessioncreator.h"
 #include "sessionlistener.h"
 #include "surfaceconfigurator.h"
-#include "surfacefactory.h"
 #include "sessionauthorizer.h"
 #include "focussetter.h"
 #include "logging.h"
 
 namespace mg = mir::graphics;
 namespace msh = mir::shell;
+namespace ms = mir::scene;
 
 ShellServerConfiguration::ShellServerConfiguration(int argc, char const* argv[], QObject* parent)
     : QObject(parent)
@@ -74,10 +74,10 @@
         });
 }
 
-std::shared_ptr<msh::SurfaceConfigurator>
-ShellServerConfiguration::the_shell_surface_configurator()
+std::shared_ptr<ms::SurfaceConfigurator>
+ShellServerConfiguration::the_surface_configurator()
 {
-    return shell_surface_configurator(
+    return surface_configurator(
         [this]()
         {
             return std::make_shared<SurfaceConfigurator>();
@@ -107,19 +107,6 @@
         });
 }
 
-// FIXME: Needed to detect the shell's surface - there must be a better way
-std::shared_ptr<msh::SurfaceFactory>
-ShellServerConfiguration::the_shell_surface_factory()
-{
-    if (!m_surfaceFactory)
-    {
-        m_surfaceFactory = std::make_shared<SurfaceFactory>(
-            DefaultServerConfiguration::the_shell_surface_factory());
-    }
-
-    return m_surfaceFactory;
-}
-
 std::shared_ptr<msh::FocusSetter>
 ShellServerConfiguration::the_shell_focus_setter()
 {
@@ -180,17 +167,12 @@
 
 SurfaceConfigurator *ShellServerConfiguration::surfaceConfigurator()
 {
-    auto sharedPtr = the_shell_surface_configurator();
+    auto sharedPtr = the_surface_configurator();
     if (sharedPtr.unique()) return 0;
 
     return static_cast<SurfaceConfigurator*>(sharedPtr.get());
 }
 
-SurfaceFactory *ShellServerConfiguration::surfaceFactory()
-{
-    return m_surfaceFactory.get();
-}
-
 FocusSetter *ShellServerConfiguration::focusSetter()
 {
     auto sharedPtr = the_shell_focus_setter();

=== modified file 'src/unity-mir/shellserverconfiguration.h'
--- src/unity-mir/shellserverconfiguration.h	2014-02-19 23:28:21 +0000
+++ src/unity-mir/shellserverconfiguration.h	2014-04-10 17:06:34 +0000
@@ -29,7 +29,6 @@
 class FocusSetter;
 class SessionListener;
 class SessionAuthorizer;
-class SurfaceFactory;
 class SurfaceConfigurator;
 class InitialSurfacePlacementStrategy;
 
@@ -40,7 +39,6 @@
     Q_PROPERTY(SessionAuthorizer* sessionAuthorizer READ sessionAuthorizer CONSTANT)
     Q_PROPERTY(SessionListener* sessionListener READ sessionListener CONSTANT)
     Q_PROPERTY(SurfaceConfigurator* surfaceConfigurator READ surfaceConfigurator CONSTANT)
-    Q_PROPERTY(SurfaceFactory* surfaceFactory READ surfaceFactory CONSTANT)
 
 public:
     ShellServerConfiguration(int argc, char const* argv[], QObject* parent = 0);
@@ -50,8 +48,7 @@
     std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> the_display_configuration_policy() override;
     std::shared_ptr<mir::shell::PlacementStrategy> the_shell_placement_strategy() override;
     std::shared_ptr<mir::shell::SessionListener> the_shell_session_listener() override;
-    std::shared_ptr<mir::shell::SurfaceConfigurator> the_shell_surface_configurator() override;
-    std::shared_ptr<mir::shell::SurfaceFactory> the_shell_surface_factory() override;
+    std::shared_ptr<mir::scene::SurfaceConfigurator> the_surface_configurator() override;
     std::shared_ptr<mir::shell::FocusSetter> the_shell_focus_setter() override;
     std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override;
     std::shared_ptr<mir::frontend::SessionAuthorizer> the_session_authorizer() override;
@@ -63,11 +60,9 @@
     SessionAuthorizer *sessionAuthorizer();
     SessionListener *sessionListener();
     SurfaceConfigurator *surfaceConfigurator();
-    SurfaceFactory *surfaceFactory();
     FocusSetter *focusSetter();
 
 protected:
-    std::shared_ptr<SurfaceFactory> m_surfaceFactory;
     std::shared_ptr<unity::protobuf::UnityService> m_unityService;
 };
 

=== modified file 'src/unity-mir/surfaceconfigurator.cpp'
--- src/unity-mir/surfaceconfigurator.cpp	2013-08-20 11:46:07 +0000
+++ src/unity-mir/surfaceconfigurator.cpp	2014-04-10 17:06:34 +0000
@@ -16,19 +16,19 @@
 
 #include "surfaceconfigurator.h"
 
-namespace msh = mir::shell;
+namespace ms = mir::scene;
 
 SurfaceConfigurator::SurfaceConfigurator()
 {
     qRegisterMetaType<MirSurfaceAttrib>("MirSurfaceAttrib");
 }
 
-int SurfaceConfigurator::select_attribute_value(msh::Surface const&, MirSurfaceAttrib, int requested_value)
+int SurfaceConfigurator::select_attribute_value(ms::Surface const&, MirSurfaceAttrib, int requested_value)
 {
     return requested_value;
 }
 
-void SurfaceConfigurator::attribute_set(msh::Surface const& surface, MirSurfaceAttrib attrib, int value)
+void SurfaceConfigurator::attribute_set(ms::Surface const& surface, MirSurfaceAttrib attrib, int value)
 {
     Q_EMIT surfaceAttributeChanged(&surface, attrib, value);
 }

=== modified file 'src/unity-mir/surfaceconfigurator.h'
--- src/unity-mir/surfaceconfigurator.h	2013-08-20 11:46:07 +0000
+++ src/unity-mir/surfaceconfigurator.h	2014-04-10 17:06:34 +0000
@@ -19,23 +19,23 @@
 
 #include <QObject>
 
-#include <mir/shell/surface_configurator.h>
+#include <mir/scene/surface_configurator.h>
 #include <mir_toolkit/common.h>
 
 namespace mir { namespace shell { class Surface; }}
 
-class SurfaceConfigurator : public QObject, public mir::shell::SurfaceConfigurator
+class SurfaceConfigurator : public QObject, public mir::scene::SurfaceConfigurator
 {
     Q_OBJECT
 
 public:
     SurfaceConfigurator();
 
-    int select_attribute_value(mir::shell::Surface const&, MirSurfaceAttrib, int) override;
-    void attribute_set(mir::shell::Surface const&, MirSurfaceAttrib, int) override;
+    int select_attribute_value(mir::scene::Surface const&, MirSurfaceAttrib, int) override;
+    void attribute_set(mir::scene::Surface const&, MirSurfaceAttrib, int) override;
 
 Q_SIGNALS:
-    void surfaceAttributeChanged(mir::shell::Surface const*, const MirSurfaceAttrib, const int);
+    void surfaceAttributeChanged(mir::scene::Surface const*, const MirSurfaceAttrib, const int);
 };
 
 #endif // SURFACECONFIGURATOR_H

=== removed file 'src/unity-mir/surfacefactory.cpp'
--- src/unity-mir/surfacefactory.cpp	2014-01-09 16:09:10 +0000
+++ src/unity-mir/surfacefactory.cpp	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "surfacefactory.h"
-#include "logging.h"
-
-// mir
-#include <mir/shell/surface_creation_parameters.h>
-
-namespace msh = mir::shell;
-namespace msc = mir::scene;
-
-SurfaceFactory::SurfaceFactory(std::shared_ptr<mir::shell::SurfaceFactory> const& surfaceFactory,
-                             QObject *parent)
-    : QObject(parent)
-    , m_surfaceFactory(surfaceFactory)
-{
-    qRegisterMetaType<std::shared_ptr<msh::Surface>>("std::shared_ptr<mir::shell::Surface>");
-}
-
-SurfaceFactory::~SurfaceFactory()
-{
-}
-
-std::shared_ptr<msh::Surface>
-SurfaceFactory::create_surface(
-        mir::shell::Session *session,
-        msh::SurfaceCreationParameters const& params,
-        mir::frontend::SurfaceId id,
-        std::shared_ptr<mir::frontend::EventSink> const& sink)
-{
-    DLOG("SurfaceFactory::create_surface");
-    static const msc::DepthId shellSurfaceDepth{1};
-    static const msc::DepthId oskSurfaceDepth{2};
-    static bool shellSurfaceFound = false; //FIXME: Hack to work around fact unable to detect shell surface
-
-    std::shared_ptr<msh::Surface> mirSurface;
-
-    if (params.name == "Qml Phone Shell" && !shellSurfaceFound) { //TODO(greyback) Need to identify shell surface more securely
-        DLOG("Shell depth");
-        auto newParams = params;
-        newParams.depth = shellSurfaceDepth;
-        newParams.input_mode = mir::input::InputReceptionMode::receives_all_input;
-        m_shellSurface = m_surfaceFactory->create_surface(session, newParams, id, sink);
-        shellSurfaceFound = true;
-        Q_EMIT shellSurfaceCreated(m_shellSurface);
-        return m_shellSurface;
-    } else if (params.name == "MaliitOnScreenKeyboard") { // FIXME: string hardcoded into maliit
-        DLOG("OSK depth");
-        auto newParams = params;
-        newParams.depth = oskSurfaceDepth;
-        return m_surfaceFactory->create_surface(session, newParams, id, sink);
-    } else {
-        DLOG("Default depth");
-        return  m_surfaceFactory->create_surface(session, params, id, sink);
-    }
-}
-
-std::shared_ptr<mir::shell::Surface> SurfaceFactory::shellSurface() const
-{
-    return m_shellSurface;
-}

=== removed file 'src/unity-mir/surfacefactory.h'
--- src/unity-mir/surfacefactory.h	2014-01-09 16:09:10 +0000
+++ src/unity-mir/surfacefactory.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SURFACESOURCE_H
-#define SURFACESOURCE_H
-
-#include <QObject>
-
-#include "mir/shell/surface_factory.h"
-
-Q_DECLARE_METATYPE(std::shared_ptr<mir::shell::Surface>)
-
-class SurfaceFactory : public QObject, public mir::shell::SurfaceFactory
-{
-    Q_OBJECT
-
-public:
-    SurfaceFactory(std::shared_ptr<mir::shell::SurfaceFactory> const& surfaceFactory,
-                  QObject *parent = 0);
-    ~SurfaceFactory();
-
-    //Called by Mir server
-    std::shared_ptr<mir::shell::Surface> create_surface(
-            mir::shell::Session* session,
-            mir::shell::SurfaceCreationParameters const& params,
-            mir::frontend::SurfaceId id,
-            std::shared_ptr<mir::frontend::EventSink> const& sink) override;
-
-    // Called by shell
-    std::shared_ptr<mir::shell::Surface> shellSurface() const;
-
-Q_SIGNALS:
-    void shellSurfaceCreated(std::shared_ptr<mir::shell::Surface> const& surface);
-
-private:
-    const std::shared_ptr<mir::shell::SurfaceFactory> m_surfaceFactory;
-    std::shared_ptr<mir::shell::Surface> m_shellSurface;
-};
-
-#endif // SURFACESOURCE_H