Merge lp:~gerboland/unity-mir/ownership-to-mir into lp:unity-mir

[Gerry Boland]

Do not directly instantiate objects, instead let Mir do it. Fixes issues with Mir since revno 982. Also rename SessionBuilder to SessionController.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/41

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/42

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Looks reasonable, and actually makes things work again, so approve :-)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/unity-mir-autolanding/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-autolanding/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-autolanding/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-autolanding/21

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Reapproving

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mir-autolanding/22/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-autolanding/22
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-autolanding/22/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-autolanding/22/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/modules/Unity/ApplicationManager/application_manager.cpp'
--- src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-21 14:58:52 +0000
+++ src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-22 12:07:06 +0000
@@ -68,11 +68,7 @@
                      this, &ApplicationManager::sessionUnfocused);
     QObject::connect(m_mirServer->sessionListener(), &SessionListener::sessionCreatedSurface,
                      this, &ApplicationManager::sessionCreatedSurface);
-
-    std::shared_ptr<SessionAuthorizer> sessionAuthorizer
-            = std::dynamic_pointer_cast<SessionAuthorizer>(m_mirServer->the_session_authorizer());
-
-    QObject::connect(sessionAuthorizer.get(), &SessionAuthorizer::requestAuthorizationForSession,
+    QObject::connect(m_mirServer->sessionAuthorizer(), &SessionAuthorizer::requestAuthorizationForSession,
                      this, &ApplicationManager::authorizedSession, Qt::BlockingQueuedConnection);
 
     // we use random numbers, so seed the generator

=== modified file 'src/unity-mir/logging.h'
--- src/unity-mir/logging.h	2013-08-09 13:16:13 +0000
+++ src/unity-mir/logging.h	2013-08-22 12:07:06 +0000
@@ -17,6 +17,8 @@
 #ifndef UBUNTU_APPLICATION_PLUGIN_LOGGING_H
 #define UBUNTU_APPLICATION_PLUGIN_LOGGING_H
 
+#include <QDebug>
+
 // Logging and assertion macros.
 #define LOG(...) qDebug(__VA_ARGS__)
 #define LOG_IF(cond,...) do { if (cond) qDebug(__VA_ARGS__); } while(0)

=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
--- src/unity-mir/shellserverconfiguration.cpp	2013-08-20 11:24:34 +0000
+++ src/unity-mir/shellserverconfiguration.cpp	2013-08-22 12:07:06 +0000
@@ -21,26 +21,20 @@
 #include "surfaceconfigurator.h"
 #include "surfacesource.h"
 #include "sessionauthorizer.h"
-#include "surfacebuilder.h"
+#include "surfacecontroller.h"
+#include "logging.h"
 
 // mir
 #include "mir/shell/organising_surface_factory.h"
 
-// Qt
-#include <QDebug>
-
 namespace msh = mir::shell;
+namespace ms = mir::surfaces;
 
 ShellServerConfiguration::ShellServerConfiguration(int argc, char const* argv[], QObject* parent)
     : QObject(parent)
     , DefaultServerConfiguration(argc, argv)
-    , m_surfaceBuilder(new SurfaceBuilder(the_surface_stack_model()))
-    , m_surfaceConfigurator(new SurfaceConfigurator)
-    , m_sessionListener(new SessionListener)
-    , m_surfaceSource(new SurfaceSource(the_surface_builder(), the_shell_surface_configurator()))
-    , m_sessionAuthorizer(new SessionAuthorizer(the_session_manager()))
 {
-    qDebug() << "ShellServerConfiguration created";
+    DLOG("ShellServerConfiguration created");
 }
 
 ShellServerConfiguration::~ShellServerConfiguration()
@@ -60,55 +54,79 @@
 std::shared_ptr<msh::SessionListener>
 ShellServerConfiguration::the_shell_session_listener()
 {
-    std::shared_ptr<SessionListener> sessionListener = m_sessionListener;
     return shell_session_listener(
-        [this, &sessionListener]
+        [this]
         {
-            return sessionListener;
+            return std::make_shared<SessionListener>();
         });
 }
 
 std::shared_ptr<msh::SurfaceConfigurator>
 ShellServerConfiguration::the_shell_surface_configurator()
 {
-    return m_surfaceConfigurator;
-}
-
+    return shell_surface_configurator(
+        [this]()
+        {
+            return std::make_shared<SurfaceConfigurator>();
+        });
+}
+
+std::shared_ptr<ms::SurfaceController>
+ShellServerConfiguration::the_surface_controller()
+{
+    return surface_controller(
+        [this]()
+        {
+            return std::make_shared<SurfaceController>(the_surface_stack_model());
+        });
+}
+
+std::shared_ptr<mir::frontend::SessionAuthorizer>
+ShellServerConfiguration::the_session_authorizer()
+{
+    return session_authorizer(
+    [this]()
+    {
+        return std::make_shared<SessionAuthorizer>(the_session_manager());
+    });
+}
+
+// FIXME: Needed to detect the shell's surface - there must be a better way
 std::shared_ptr<msh::SurfaceFactory>
 ShellServerConfiguration::the_shell_surface_factory()
 {
     return shell_surface_factory(
-        [this]
+        [this]()
         {
-            return std::make_shared<mir::shell::OrganisingSurfaceFactory>(
+            m_surfaceSource = std::make_shared<SurfaceSource>(
+                the_surface_builder(), the_shell_surface_configurator());
+
+            return std::make_shared<msh::OrganisingSurfaceFactory>(
                 m_surfaceSource,
                 the_shell_placement_strategy());
         });
 }
 
-std::shared_ptr<msh::SurfaceBuilder>
-ShellServerConfiguration::the_surface_builder()
-{
-    return m_surfaceBuilder;
-}
-
-std::shared_ptr<mir::frontend::SessionAuthorizer>
-ShellServerConfiguration::the_session_authorizer()
-{
-    return m_sessionAuthorizer;
-}
-
-SurfaceConfigurator *ShellServerConfiguration::surfaceConfigurator() const
-{
-    return m_surfaceConfigurator.get();
-}
-
-SessionListener *ShellServerConfiguration::sessionListener() const
-{
-    return m_sessionListener.get();
-}
-
-SurfaceSource *ShellServerConfiguration::surfaceSource() const
+/************************************ Shell side ************************************/
+SessionAuthorizer *ShellServerConfiguration::sessionAuthorizer()
+{
+    SessionAuthorizer *ptr = static_cast<SessionAuthorizer*>(the_session_authorizer().get());
+    return q_check_ptr(ptr); //CHECKME will this always be ready before shell comes up?
+}
+
+SessionListener *ShellServerConfiguration::sessionListener()
+{
+    SessionListener *ptr = static_cast<SessionListener*>(the_shell_session_listener().get());
+    return q_check_ptr(ptr); //CHECKME will this always be ready before shell comes up?
+}
+
+SurfaceConfigurator *ShellServerConfiguration::surfaceConfigurator()
+{
+    SurfaceConfigurator *ptr = static_cast<SurfaceConfigurator*>(the_shell_surface_configurator().get());
+    return q_check_ptr(ptr); //CHECKME will this always be ready before shell comes up?
+}
+
+SurfaceSource *ShellServerConfiguration::surfaceSource()
 {
     return m_surfaceSource.get();
 }

=== modified file 'src/unity-mir/shellserverconfiguration.h'
--- src/unity-mir/shellserverconfiguration.h	2013-08-16 16:07:50 +0000
+++ src/unity-mir/shellserverconfiguration.h	2013-08-22 12:07:06 +0000
@@ -23,15 +23,15 @@
 class SessionListener;
 class SessionAuthorizer;
 class SurfaceSource;
-class SurfaceBuilder;
 class SurfaceConfigurator;
 
 class ShellServerConfiguration : public QObject, public mir::DefaultServerConfiguration
 {
     Q_OBJECT
 
+    Q_PROPERTY(SessionAuthorizer* sessionAuthorizer READ sessionAuthorizer CONSTANT)
+    Q_PROPERTY(SessionListener* sessionListener READ sessionListener CONSTANT)
     Q_PROPERTY(SurfaceConfigurator* surfaceConfigurator READ surfaceConfigurator CONSTANT)
-    Q_PROPERTY(SessionListener* sessionListener READ sessionListener CONSTANT)
     Q_PROPERTY(SurfaceSource* surfaceSource READ surfaceSource CONSTANT)
 
 public:
@@ -44,20 +44,17 @@
     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::frontend::SessionAuthorizer> the_session_authorizer() override;
-    std::shared_ptr<mir::shell::SurfaceBuilder> the_surface_builder() override;
+    std::shared_ptr<mir::surfaces::SurfaceController> the_surface_controller() override;
 
     /* qt specific */
     // getters
-    SurfaceConfigurator *surfaceConfigurator() const;
-    SessionListener *sessionListener() const;
-    SurfaceSource *surfaceSource() const;
+    SessionAuthorizer *sessionAuthorizer();
+    SessionListener *sessionListener();
+    SurfaceConfigurator *surfaceConfigurator();
+    SurfaceSource *surfaceSource();
 
 protected:
-    std::shared_ptr<SurfaceBuilder> m_surfaceBuilder;
-    std::shared_ptr<SurfaceConfigurator> m_surfaceConfigurator;
-    std::shared_ptr<SessionListener> m_sessionListener;
     std::shared_ptr<SurfaceSource> m_surfaceSource;
-    std::shared_ptr<SessionAuthorizer> m_sessionAuthorizer;
 };
 
 #endif // SHELLSERVERCONFIGURATION_H

=== renamed file 'src/unity-mir/surfacebuilder.cpp' => 'src/unity-mir/surfacecontroller.cpp'
--- src/unity-mir/surfacebuilder.cpp	2013-08-20 12:31:11 +0000
+++ src/unity-mir/surfacecontroller.cpp	2013-08-22 12:07:06 +0000
@@ -17,28 +17,28 @@
 #include <mir/surfaces/surface_stack_model.h>
 #include <mir/shell/surface_creation_parameters.h> // TODO: Remove ~racarr
 
-#include "surfacebuilder.h"
+#include "surfacecontroller.h"
 
 #include "logging.h"
 
 namespace msh = mir::shell;
 namespace ms = mir::surfaces;
 
-SurfaceBuilder::SurfaceBuilder(const std::shared_ptr<ms::SurfaceStackModel>& surfaceStack, QObject *parent) :
+SurfaceController::SurfaceController(const std::shared_ptr<ms::SurfaceStackModel>& surfaceStack, QObject *parent) :
     QObject(parent),
-    m_surfaceStack(surfaceStack)
-{
-    DLOG("SurfaceBuilder::SurfaceBuilder (this=%p)", this);
-}
-
-SurfaceBuilder::~SurfaceBuilder()
-{
-    DLOG("SurfaceBuilder::~SurfaceBuilder (this=%p)", this);
-}
-
-std::weak_ptr<ms::Surface> SurfaceBuilder::create_surface(mir::shell::Session *session, const msh::SurfaceCreationParameters& params)
-{
-    DLOG("SurfaceBuilder::~create_surface (this=%p)", this);
+    ms::SurfaceController(surfaceStack)
+{
+    DLOG("SurfaceController::SurfaceController (this=%p)", this);
+}
+
+SurfaceController::~SurfaceController()
+{
+    DLOG("SurfaceController::~SurfaceController (this=%p)", this);
+}
+
+std::weak_ptr<ms::Surface> SurfaceController::create_surface(msh::Session *session, const msh::SurfaceCreationParameters& params)
+{
+    DLOG("SurfaceController::~create_surface (this=%p)", this);
     Q_UNUSED(session)
 
     static const ms::DepthId shellSurfaceDepth{1};
@@ -50,21 +50,15 @@
         auto newParams = params;
         newParams.depth = shellSurfaceDepth;
         shellSurfaceFound = true;
-        return m_surfaceStack->create_surface(newParams);
+        return surface_stack->create_surface(newParams);
     } else if (params.name == "MaliitOnScreenKeyboard") { // FIXME: string hardcoded into maliit
         DLOG("OSK depth");
         auto newParams = params;
         newParams.depth = oskSurfaceDepth;
-        return m_surfaceStack->create_surface(newParams);
+        return surface_stack->create_surface(newParams);
     } else {
         DLOG("Default depth");
-        return m_surfaceStack->create_surface(params);
+        return surface_stack->create_surface(params);
     }
 }
 
-void SurfaceBuilder::destroy_surface(const std::weak_ptr<ms::Surface>& surface)
-{
-    DLOG("SurfaceBuilder::~destroy_surface (this=%p)", this);
-
-    m_surfaceStack->destroy_surface(surface);
-}

=== renamed file 'src/unity-mir/surfacebuilder.h' => 'src/unity-mir/surfacecontroller.h'
--- src/unity-mir/surfacebuilder.h	2013-08-12 11:12:48 +0000
+++ src/unity-mir/surfacecontroller.h	2013-08-22 12:07:06 +0000
@@ -14,31 +14,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SURFACEBUILDER_H
-#define SURFACEBUILDER_H
+#ifndef SURFACECONTROLLER_H
+#define SURFACECONTROLLER_H
 
 #include <QObject>
 
-#include "mir/shell/surface_builder.h"
+#include "mir/surfaces/surface_controller.h"
 
 namespace mir { namespace surfaces { class SurfaceStackModel; }}
 
-class SurfaceBuilder : public QObject, public mir::shell::SurfaceBuilder
+class SurfaceController : public QObject, public mir::surfaces::SurfaceController
 {
     Q_OBJECT
 
 public:
-    explicit SurfaceBuilder(const std::shared_ptr<mir::surfaces::SurfaceStackModel>& surfaceStack, QObject *parent = 0);
-    ~SurfaceBuilder();
+    explicit SurfaceController(const std::shared_ptr<mir::surfaces::SurfaceStackModel>& surfaceStack, QObject *parent = 0);
+    ~SurfaceController();
 
     virtual std::weak_ptr<mir::surfaces::Surface> create_surface(
             mir::shell::Session* session,
             const mir::shell::SurfaceCreationParameters &params) override;
-
-    virtual void destroy_surface(const std::weak_ptr<mir::surfaces::Surface>& surface) override;
-
-private:
-    const std::shared_ptr<mir::surfaces::SurfaceStackModel> m_surfaceStack;
 };
 
-#endif // SURFACEBUILDER_H
+#endif // SURFACECONTROLLER_H

=== modified file 'src/unity-mir/unity-mir.pro'
--- src/unity-mir/unity-mir.pro	2013-08-21 09:36:24 +0000
+++ src/unity-mir/unity-mir.pro	2013-08-22 12:07:06 +0000
@@ -19,7 +19,7 @@
     sessionauthorizer.cpp \
     sessionlistener.cpp \
     shellserverconfiguration.cpp \
-    surfacebuilder.cpp \
+    surfacecontroller.cpp \
     surfacesource.cpp \
     surfaceconfigurator.cpp
 
@@ -29,7 +29,7 @@
     sessionauthorizer.h \
     sessionlistener.h \
     shellserverconfiguration.h \
-    surfacebuilder.h \
+    surfacecontroller.h \
     surfacesource.h \
     surfaceconfigurator.h \
     logging.h
@@ -42,7 +42,7 @@
     sessionauthorizer.h \
     sessionlistener.h \
     shellserverconfiguration.h \
-    surfacebuilder.h \
+    surfacecontroller.h \
     surfacesource.h
 install_headers.path = /usr/include/unity-mir