Merge lp:~alan-griffiths/unity-mir/we-dont-need-SurfaceBuilder into lp:unity-mir

[Alan Griffiths]

Do all the hacky surface creation customization in SurfaceFactory::create_surface() - and don't mention SurfaceBuilder at all. (That will allow Mir to get rid of that interface.)

Do all the hacky surface creation customization in SurfaceFactory::create_surface() - and don't mention SurfaceBuilder at all. (That will allow Mir to get rid of that interface.)

I'm not entirely sure how to test this does everything needed - so please double check.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/13

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/152/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
--- src/unity-mir/shellserverconfiguration.cpp	2013-10-30 17:46:50 +0000
+++ src/unity-mir/shellserverconfiguration.cpp	2013-11-14 14:02:07 +0000
@@ -21,7 +21,6 @@
 #include "surfaceconfigurator.h"
 #include "surfacefactory.h"
 #include "sessionauthorizer.h"
-#include "surfacebuilder.h"
 #include "focussetter.h"
 #include "logging.h"
 
@@ -69,16 +68,6 @@
         });
 }
 
-std::shared_ptr<msh::SurfaceBuilder>
-ShellServerConfiguration::the_surface_builder()
-{
-    return m_surfaceBuilder(
-        [this]()
-        {
-            return std::make_shared<SurfaceBuilder>(DefaultServerConfiguration::the_surface_builder());
-        });
-}
-
 std::shared_ptr<mir::frontend::SessionAuthorizer>
 ShellServerConfiguration::the_session_authorizer()
 {

=== modified file 'src/unity-mir/shellserverconfiguration.h'
--- src/unity-mir/shellserverconfiguration.h	2013-10-30 17:46:50 +0000
+++ src/unity-mir/shellserverconfiguration.h	2013-11-14 14:02:07 +0000
@@ -47,7 +47,6 @@
     std::shared_ptr<mir::shell::SurfaceFactory> the_shell_surface_factory() override;
     std::shared_ptr<mir::shell::FocusSetter> the_shell_focus_setter() override;
     std::shared_ptr<mir::frontend::SessionAuthorizer> the_session_authorizer() override;
-    std::shared_ptr<mir::shell::SurfaceBuilder> the_surface_builder() override;
 
     /* qt specific */
     // getters
@@ -59,9 +58,6 @@
 
 protected:
     std::shared_ptr<SurfaceFactory> m_surfaceFactory;
-
-private:
-    mir::CachedPtr<mir::shell::SurfaceBuilder> m_surfaceBuilder;
 };
 
 #endif // SHELLSERVERCONFIGURATION_H

=== removed file 'src/unity-mir/surfacebuilder.cpp'
--- src/unity-mir/surfacebuilder.cpp	2013-11-08 10:09:33 +0000
+++ src/unity-mir/surfacebuilder.cpp	1970-01-01 00:00:00 +0000
@@ -1,70 +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/>.
- */
-
-#include <mir/shell/surface_creation_parameters.h> // TODO: Remove ~racarr
-
-#include "surfacebuilder.h"
-
-#include "logging.h"
-
-namespace msh = mir::shell;
-namespace ms = mir::surfaces;
-
-SurfaceBuilder::SurfaceBuilder(const std::shared_ptr<mir::shell::SurfaceBuilder>& surfaceBuilder, QObject *parent) :
-    QObject(parent),
-    m_surfaceBuilder(surfaceBuilder)
-{
-    DLOG("SurfaceBuilder::SurfaceBuilder (this=%p)", this);
-}
-
-SurfaceBuilder::~SurfaceBuilder()
-{
-    DLOG("SurfaceBuilder::~SurfaceBuilder (this=%p)", this);
-}
-
-void SurfaceBuilder::destroy_surface(SurfacePtr const& surface)
-{
-    return m_surfaceBuilder->destroy_surface(surface);
-}
-
-
-SurfaceBuilder::SurfacePtr SurfaceBuilder::create_surface(msh::Session *session, const msh::SurfaceCreationParameters& params)
-{
-    DLOG("SurfaceBuilder::~create_surface (this=%p)", this);
-    Q_UNUSED(session)
-
-    static const ms::DepthId shellSurfaceDepth{1};
-    static const ms::DepthId oskSurfaceDepth{2};
-    static bool shellSurfaceFound = false;
-
-    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;        
-        shellSurfaceFound = true;
-        return m_surfaceBuilder->create_surface(session, newParams);
-    } else if (params.name == "MaliitOnScreenKeyboard") { // FIXME: string hardcoded into maliit
-        DLOG("OSK depth");
-        auto newParams = params;
-        newParams.depth = oskSurfaceDepth;
-        return m_surfaceBuilder->create_surface(session, newParams);
-    } else {
-        DLOG("Default depth");
-        return m_surfaceBuilder->create_surface(session, params);
-    }
-}
-

=== removed file 'src/unity-mir/surfacebuilder.h'
--- src/unity-mir/surfacebuilder.h	2013-11-08 10:09:33 +0000
+++ src/unity-mir/surfacebuilder.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 SURFACECONTROLLER_H
-#define SURFACECONTROLLER_H
-
-#include <QObject>
-
-#include "mir/shell/surface_builder.h"
-
-#include <type_traits>
-
-namespace mir { namespace surfaces { class SurfaceStackModel; }}
-
-class SurfaceBuilder : public QObject, public mir::shell::SurfaceBuilder
-{
-    Q_OBJECT
-
-public:
-
-    // A bit ugly, but makes code portable across some Mir refactoring
-    // I will come back and tidy up! - alan_g
-    using SurfacePtr = std::result_of<
-        decltype(&mir::shell::SurfaceBuilder::create_surface)
-        (mir::shell::SurfaceBuilder*, mir::shell::Session*, mir::shell::SurfaceCreationParameters const&)>::type;
-
-    explicit SurfaceBuilder(const std::shared_ptr<mir::shell::SurfaceBuilder>& surfaceBuilder, QObject *parent = 0);
-    ~SurfaceBuilder();
-
-    virtual void destroy_surface(SurfacePtr const& surface) override;
-
-    virtual SurfacePtr create_surface(
-            mir::shell::Session* session,
-            const mir::shell::SurfaceCreationParameters &params) override;
-
-private:
-    const std::shared_ptr<mir::shell::SurfaceBuilder> m_surfaceBuilder;
-};
-
-#endif // SURFACECONTROLLER_H

=== modified file 'src/unity-mir/surfacefactory.cpp'
--- src/unity-mir/surfacefactory.cpp	2013-10-30 16:40:38 +0000
+++ src/unity-mir/surfacefactory.cpp	2013-11-14 14:02:07 +0000
@@ -19,10 +19,10 @@
 #include "logging.h"
 
 // mir
-#include "mir/shell/surface_builder.h"
-#include "mir/shell/surface_configurator.h"
+#include <mir/shell/surface_creation_parameters.h>
 
 namespace msh = mir::shell;
+namespace ms = mir::surfaces;
 
 SurfaceFactory::SurfaceFactory(std::shared_ptr<mir::shell::SurfaceFactory> const& surfaceFactory,
                              QObject *parent)
@@ -44,15 +44,30 @@
         std::shared_ptr<mir::frontend::EventSink> const& sink)
 {
     DLOG("SurfaceFactory::create_surface");
-    std::shared_ptr<msh::Surface> mirSurface = m_surfaceFactory->create_surface(session, params, id, sink);
-
+    static const ms::DepthId shellSurfaceDepth{1};
+    static const ms::DepthId oskSurfaceDepth{2};
     static bool shellSurfaceFound = false; //FIXME: Hack to work around fact unable to detect shell surface
-    if (!shellSurfaceFound) {
-        m_shellSurface = mirSurface;
+
+    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(mirSurface);
+        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);
     }
-    return mirSurface;
 }
 
 std::shared_ptr<mir::shell::Surface> SurfaceFactory::shellSurface() const

=== modified file 'src/unity-mir/unity-mir.pro'
--- src/unity-mir/unity-mir.pro	2013-10-30 17:46:50 +0000
+++ src/unity-mir/unity-mir.pro	2013-11-14 14:02:07 +0000
@@ -21,7 +21,6 @@
     sessionauthorizer.cpp \
     sessionlistener.cpp \
     shellserverconfiguration.cpp \
-    surfacebuilder.cpp \
     surfacefactory.cpp \
     surfaceconfigurator.cpp \
     focussetter.cpp
@@ -34,7 +33,6 @@
     sessionauthorizer.h \
     sessionlistener.h \
     shellserverconfiguration.h \
-    surfacebuilder.h \
     surfacefactory.h \
     surfaceconfigurator.h \
     logging.h \