Merge lp:~alan-griffiths/mir/fix-1718677 into lp:mir

[Alan Griffiths]

Don't leak WlShellSurface instances (LP: #1718677)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4259
https://mir-jenkins.ubuntu.com/job/mir-ci/3676/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5036
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5272
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5260
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5260
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5260
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5079/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5079/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5079/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5079/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5079/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5079/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5079/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5079
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5079/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3676/rebuild

review: Approve (continuous-integration)

Unmerged revisions

4259. By Alan Griffiths on 2017-09-21

Don't leak WlShellSurface instances

=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-15 16:34:13 +0000
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-21 16:25:36 +0000
@@ -1409,7 +1409,7 @@
                 shell->modify_surface(session, id, hide_spec);
             });
 
-        auto shim = new DestructionShim{session, shell, surface_id};
+        auto shim = new DestructionShim{session, shell, surface_id, this};
         shim->destruction_listener.notify = &cleanup_surface;
         wl_resource_add_destroy_listener(
             resource,
@@ -1476,10 +1476,12 @@
         DestructionShim(
             std::shared_ptr<mf::Session> const& session,
             std::shared_ptr<mf::Shell> const& shell,
-            mf::SurfaceId id)
+            mf::SurfaceId id,
+            WlShellSurface* self)
             : session{session},
               shell{shell},
-              surface_id{id}
+              surface_id{id},
+              self{self}
         {
         }
 
@@ -1487,6 +1489,7 @@
         std::shared_ptr<mf::Shell> const shell;
         mf::SurfaceId const surface_id;
         wl_listener destruction_listener;
+        std::unique_ptr<WlShellSurface> const self;
     };
 
     static_assert(