Merge lp:~kdub/mir/fix-1612256 into lp:mir

[Kevin DuBois]

Have the MirSurface report the shell-designated size like it used to, instead of the spec-requested size.

fixes: LP: #1612256

Have the MirSurface report the shell-designated size like it used to, instead of the spec-requested size.

fixes: LP: #1612256

cherry picking to 0.24

[Alan Griffiths (alan-griffiths)]

/o\

review: Approve

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

PASSED: Continuous integration, rev:3644
https://mir-jenkins.ubuntu.com/job/mir-ci/1443/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1773
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1827
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1818
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1818
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1818
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1797
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/1797/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1797
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1797/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1797
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1797/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1797
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1797/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1797
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1797/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1797
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1797/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2016-06-24 07:41:32 +0000
+++ src/client/mir_surface.cpp	2016-08-12 13:18:30 +0000
@@ -127,9 +127,9 @@
       keymapper(std::make_shared<mircv::XKBMapper>()),
       configure_result{mcl::make_protobuf_object<mir::protobuf::SurfaceSetting>()},
       creation_handle(handle),
-      size(spec.width.is_set() && spec.height.is_set() ? geom::Size{spec.width.value(), spec.height.value()} : geom::Size{0,0}),
-      format(spec.pixel_format.is_set() ? spec.pixel_format.value() : mir_pixel_format_invalid),
-      usage(spec.buffer_usage.is_set() ? spec.buffer_usage.value() : mir_buffer_usage_hardware),
+      size({surface_proto.width(), surface_proto.height()}),
+      format(static_cast<MirPixelFormat>(surface_proto.pixel_format())),
+      usage(static_cast<MirBufferUsage>(surface_proto.buffer_usage())),
       output_id(spec.output_id.is_set() ? spec.output_id.value() : static_cast<uint32_t>(mir_display_output_id_invalid))
 {
     for(int i = 0; i < surface_proto.attributes_size(); i++)

=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2016-08-10 10:43:39 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2016-08-12 13:18:30 +0000
@@ -555,14 +555,38 @@
     EXPECT_CALL(*mock_stream, set_size(size));
     auto ev = mir::events::make_event(mir::frontend::SurfaceId(2), size);
 
+    surface_proto.set_width(size.width.as_int());
+    surface_proto.set_height(size.height.as_int());
+
     MirSurface surface{connection.get(), *client_comm_channel, nullptr,
         mock_stream, mock_input_platform, spec, surface_proto, wh};
 
     auto params = surface.get_parameters();
-    EXPECT_THAT(params.width, Eq(spec.width.value())); 
-    EXPECT_THAT(params.height, Eq(spec.height.value()));
+    EXPECT_THAT(params.width, Eq(size.width.as_int())); 
+    EXPECT_THAT(params.height, Eq(size.height.as_int()));
     surface.handle_event(*ev);
     params = surface.get_parameters();
     EXPECT_THAT(params.width, Eq(size.width.as_int())); 
     EXPECT_THAT(params.height, Eq(size.height.as_int()));
 }
+
+//LP: #1612256
+TEST_F(MirClientSurfaceTest, initial_sizes_are_from_response_from_server)
+{
+    using namespace testing;
+    auto mock_stream = std::make_shared<mtd::MockClientBufferStream>(); 
+    auto mock_input_platform = std::make_shared<NiceMock<MockClientInputPlatform>>();
+    ON_CALL(*mock_input_platform, create_input_receiver(_,_,_))
+        .WillByDefault(Return(std::make_shared<mt::TestDispatchable>([]{})));
+    ON_CALL(*mock_stream, rpc_id()).WillByDefault(Return(mir::frontend::BufferStreamId(2)));
+    geom::Size size(120, 124);
+
+    surface_proto.set_width(size.width.as_int());
+    surface_proto.set_height(size.height.as_int());
+    MirSurface surface{connection.get(), *client_comm_channel, nullptr,
+        mock_stream, mock_input_platform, spec, surface_proto, wh};
+
+    auto params = surface.get_parameters();
+    EXPECT_THAT(params.width, Eq(size.width.as_int()));
+    EXPECT_THAT(params.height, Eq(size.height.as_int()));
+}