Merge lp:~gerboland/qtmir/remove-legacy-notification-support into lp:qtmir

[Gerry Boland]

Remove legacy surface configuration change code, use newer SurfaceObserver

Remove legacy surface configuration change code, use newer SurfaceObserver

* Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * 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)]

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/qtmir-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/84/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/233/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Yes

review: Approve

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2015-02-20 10:08:31 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2015-03-11 10:13:19 +0000
@@ -255,6 +255,7 @@
     m_surfaceObserver = observer;
     if (observer) {
         connect(observer.get(), &SurfaceObserver::framesPosted, this, &MirSurfaceItem::surfaceDamaged);
+        connect(observer.get(), &SurfaceObserver::attributeChanged, this, &MirSurfaceItem::onAttributeChanged);
         observer->setListener(this);
     }
 
@@ -692,8 +693,7 @@
     }
 }
 
-// Called by MirSurfaceItemManager upon a msh::Surface attribute change
-void MirSurfaceItem::setAttribute(const MirSurfaceAttrib attribute, const int /*value*/)
+void MirSurfaceItem::onAttributeChanged(const MirSurfaceAttrib attribute, const int /*value*/)
 {
     switch (attribute) {
     case mir_surface_attrib_type:

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
--- src/modules/Unity/Application/mirsurfaceitem.h	2015-02-06 09:47:21 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.h	2015-03-11 10:13:19 +0000
@@ -144,6 +144,7 @@
     void updateMirSurfaceSize();
 
     void updateMirSurfaceFocus(bool focused);
+    void onAttributeChanged(const MirSurfaceAttrib, const int);
 
 private:
     bool updateTexture();
@@ -154,7 +155,6 @@
     void setLive(const bool);
 
     // called by MirSurfaceManager
-    void setAttribute(const MirSurfaceAttrib, const int);
     void setSurfaceValid(const bool);
 
     bool hasTouchInsideUbuntuKeyboard(const QList<QTouchEvent::TouchPoint> &touchPoints);

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2015-02-06 09:47:21 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2015-03-11 10:13:19 +0000
@@ -51,12 +51,6 @@
                      manager, &MirSurfaceManager::onSessionDestroyingSurface);
 }
 
-void connectToShell(MirSurfaceManager *manager, MirShell *shell)
-{
-    QObject::connect(shell, &MirShell::surfaceAttributeChanged,
-                     manager, &MirSurfaceManager::onSurfaceAttributeChanged);
-}
-
 MirSurfaceManager* MirSurfaceManager::singleton()
 {
     if (!the_surface_manager) {
@@ -75,7 +69,6 @@
         the_surface_manager = new MirSurfaceManager(nativeInterface->m_mirServer, shell, SessionManager::singleton());
 
         connectToSessionListener(the_surface_manager, sessionListener);
-        connectToShell(the_surface_manager, shell);
     }
     return the_surface_manager;
 }
@@ -167,19 +160,4 @@
     Q_EMIT surfaceDestroyed(item);
 }
 
-// NB: Surface might be a dangling pointer here, so refrain from dereferencing it.
-void MirSurfaceManager::onSurfaceAttributeChanged(const ms::Surface *surface,
-                                                  const MirSurfaceAttrib attribute, const int value)
-{
-    qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::onSurfaceAttributeChanged - surface=" << surface
-                            << qPrintable(mirSurfaceAttribAndValueToString(attribute, value));
-
-    QMutexLocker lock(&m_mutex);
-    auto it = m_mirSurfaceToItemHash.find(surface);
-    if (it != m_mirSurfaceToItemHash.end()) {
-        it.value()->setAttribute(attribute, value);
-    }
-}
-
-
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
--- src/modules/Unity/Application/mirsurfacemanager.h	2015-02-06 09:47:21 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.h	2015-03-11 10:13:19 +0000
@@ -73,10 +73,7 @@
     void onSessionCreatedSurface(const mir::scene::Session *, const std::shared_ptr<mir::scene::Surface> &, std::shared_ptr<SurfaceObserver> const&);
     void onSessionDestroyingSurface(const mir::scene::Session *, const std::shared_ptr<mir::scene::Surface> &);
 
-    void onSurfaceAttributeChanged(const mir::scene::Surface *, MirSurfaceAttrib, int);
-
 protected:
-
     QHash<const mir::scene::Surface *, MirSurfaceItem *> m_mirSurfaceToItemHash;
     QMutex m_mutex;
 

=== modified file 'src/platforms/mirserver/mirshell.cpp'
--- src/platforms/mirserver/mirshell.cpp	2015-02-04 17:17:53 +0000
+++ src/platforms/mirserver/mirshell.cpp	2015-03-11 10:13:19 +0000
@@ -61,15 +61,3 @@
 
      return AbstractShell::create_surface(session, placedParameters);
 }
-
-int MirShell::set_surface_attribute(
-    const std::shared_ptr<mir::scene::Session> &session,
-    const std::shared_ptr<mir::scene::Surface> &surface,
-    MirSurfaceAttrib attrib,
-    int value)
-{
-    auto const result = AbstractShell::set_surface_attribute(session, surface, attrib, value);
-    Q_EMIT surfaceAttributeChanged(surface.get(), attrib, result);
-
-    return result;
-}

=== modified file 'src/platforms/mirserver/mirshell.h'
--- src/platforms/mirserver/mirshell.h	2015-02-04 17:17:53 +0000
+++ src/platforms/mirserver/mirshell.h	2015-03-11 10:13:19 +0000
@@ -40,15 +40,6 @@
 
     virtual mir::frontend::SurfaceId create_surface(const std::shared_ptr<mir::scene::Session>& session, const mir::scene::SurfaceCreationParameters &params);
 
-    int set_surface_attribute(
-        const std::shared_ptr<mir::scene::Session> &session,
-        const std::shared_ptr<mir::scene::Surface> &surface,
-        MirSurfaceAttrib attrib,
-        int value) override;
-
-Q_SIGNALS:
-    void surfaceAttributeChanged(mir::scene::Surface const*, const MirSurfaceAttrib, const int);
-
 private:
     std::shared_ptr<mir::shell::DisplayLayout> const m_displayLayout;
 };

=== modified file 'src/platforms/mirserver/surfaceobserver.cpp'
--- src/platforms/mirserver/surfaceobserver.cpp	2014-12-16 14:30:47 +0000
+++ src/platforms/mirserver/surfaceobserver.cpp	2015-03-11 10:13:19 +0000
@@ -24,16 +24,26 @@
 {
 }
 
-void SurfaceObserver::setListener(QObject *listener) {
+void SurfaceObserver::setListener(QObject *listener)
+{
     m_listener = listener;
     if (m_framesPosted) {
         Q_EMIT framesPosted();
     }
 }
 
-void SurfaceObserver::frame_posted(int /*frames_available*/) {
+void SurfaceObserver::frame_posted(int /*frames_available*/)
+{
     m_framesPosted = true;
     if (m_listener) {
         Q_EMIT framesPosted();
     }
 }
+
+void SurfaceObserver::attrib_changed(MirSurfaceAttrib attribute, int value)
+{
+    if (m_listener) {
+        Q_EMIT attributeChanged(attribute, value);
+    }
+}
+

=== modified file 'src/platforms/mirserver/surfaceobserver.h'
--- src/platforms/mirserver/surfaceobserver.h	2015-01-14 08:24:29 +0000
+++ src/platforms/mirserver/surfaceobserver.h	2015-03-11 10:13:19 +0000
@@ -20,7 +20,8 @@
 #include <QObject>
 #include <mir/scene/surface_observer.h>
 
-class SurfaceObserver : public QObject, public mir::scene::SurfaceObserver {
+class SurfaceObserver : public QObject, public mir::scene::SurfaceObserver
+{
     Q_OBJECT
 
 public:
@@ -28,7 +29,7 @@
 
     void setListener(QObject *listener);
 
-    void attrib_changed(MirSurfaceAttrib, int) override {}
+    void attrib_changed(MirSurfaceAttrib, int) override;
     void resized_to(mir::geometry::Size const&) override {}
     void moved_to(mir::geometry::Point const&) override {}
     void hidden_set_to(bool) override {}
@@ -44,6 +45,7 @@
     void client_surface_close_requested() override {}
 
 Q_SIGNALS:
+    void attributeChanged(const MirSurfaceAttrib attribute, const int value);
     void framesPosted();
 
 private: