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

[Alan Griffiths]

Only notify resize events for valid surfaces

[Alan Griffiths (alan-griffiths)]

This is the real change:

- if (spec.width.is_set() && spec.height.is_set() && spec.event_handler.is_set())
+ if (MirWindow::is_valid(surf.get()) && spec.width.is_set() && spec.height.is_set() && spec.event_handler.is_set())

the rest is trailing whitespace

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

PASSED: Continuous integration, rev:4206
https://mir-jenkins.ubuntu.com/job/mir-ci/3491/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4767
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4939
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4928
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4928
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4928
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4804/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4804/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4804/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4804/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4804/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/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4804/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/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4804/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4804
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4804/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

LGTM

review: Approve

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2017-06-30 11:32:37 +0000
+++ src/client/mir_connection.cpp	2017-07-18 09:14:14 +0000
@@ -378,7 +378,7 @@
         surface_requests.emplace_back(c);
     }
 
-    try 
+    try
     {
         server.create_surface(&message, c->response.get(),
             gp::NewCallback(this, &MirConnection::surface_created, c.get()));
@@ -419,7 +419,7 @@
     if (request_it == surface_requests.end())
         return;
 
-    auto surface_proto = request->response; 
+    auto surface_proto = request->response;
     auto callback = request->cb;
     auto context = request->context;
     auto const& spec = request->spec;
@@ -456,7 +456,7 @@
             reason += surface_proto->error();
         if (surface_proto->has_error() && !surface_proto->has_id())
             reason += " and ";
-        if (!surface_proto->has_id()) 
+        if (!surface_proto->has_id())
             reason +=  "Server assigned surface no id";
         auto id = next_error_id(lock);
         surf = std::make_shared<MirWindow>(reason, this, id, request->wh);
@@ -471,7 +471,7 @@
 
     callback(surf.get(), context);
 
-    if (spec.width.is_set() && spec.height.is_set() && spec.event_handler.is_set())
+    if (MirWindow::is_valid(surf.get()) && spec.width.is_set() && spec.height.is_set() && spec.event_handler.is_set())
     {
         mir::geometry::Size requested_size{spec.width.value(), spec.height.value()};
         mir::geometry::Size actual_size{(*surface_proto).width(), (*surface_proto).height()};
@@ -569,7 +569,7 @@
         callback(surface, context);
         auto id = surface->id();
         surface_map->erase(mf::SurfaceId(id));
-        return raw_wait_handle;    
+        return raw_wait_handle;
     }
 
     SurfaceRelease surf_release{surface, raw_wait_handle, callback, context};
@@ -1299,7 +1299,7 @@
         callback, context);
     server.allocate_buffers(&request, ignored.get(), gp::NewCallback(ignore));
 }
- 
+
 void MirConnection::allocate_buffer(
     geom::Size size, uint32_t native_format, uint32_t native_flags,
     MirBufferCallback callback, void* context)