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

[Alan Griffiths]

scene: Ensure that the active application can get the correct display configuration

scene: Ensure that the active application can get the correct display configuration

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2915
http://jenkins.qa.ubuntu.com/job/mir-ci/4841/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/990
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/990/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3831
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6559
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23182

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Chris Halse Rogers (raof)]

Yup, sensible. I was looking through here recently thinking things were a bit incorrect!

review: Approve

=== modified file 'src/server/scene/mediating_display_changer.cpp'
--- src/server/scene/mediating_display_changer.cpp	2015-09-09 17:27:56 +0000
+++ src/server/scene/mediating_display_changer.cpp	2015-09-09 17:27:56 +0000
@@ -246,10 +246,12 @@
     if (it != config_map.end())
     {
         apply_config(it->second, PauseResumeSystem);
+        session->send_display_config(*it->second);
     }
     else if (!base_configuration_applied)
     {
         apply_base_config(PauseResumeSystem);
+        session->send_display_config(*base_configuration);
     }
 }
 

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2015-09-09 17:27:56 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2015-09-09 17:27:56 +0000
@@ -423,3 +423,43 @@
     mir_surface_release_sync(painted_surface);
     mir_connection_release(connection);
 }
+
+namespace
+{
+void config_update(MirConnection* /*connection*/, void* context)
+{
+    static_cast<mt::WaitCondition*>(context)->wake_up_everyone();
+}
+}
+
+// lp:1493741
+TEST_F(NestedServer, display_configuration_changes_are_visible_to_client_when_it_becomes_active)
+{
+    NestedMirRunner nested_mir{new_connection()};
+    ignore_rebuild_of_egl_context();
+
+    auto const connection = mir_connect_sync(nested_mir.new_connection().c_str(), __PRETTY_FUNCTION__);
+
+    mt::WaitCondition condition;
+    mir_connection_set_display_config_change_callback(connection, &config_update, &condition);
+
+    auto const configuration = mir_connection_create_display_config(connection);
+
+    for(auto* output = configuration->outputs; output != configuration->outputs+configuration->num_outputs; ++ output)
+        output->orientation = mir_orientation_left;
+
+    mir_wait_for(mir_connection_apply_display_config(connection, configuration));
+
+    // Need a painted surface to have focus
+    auto const painted_surface = make_and_paint_surface(connection);
+
+    condition.wait_for_at_most_seconds(1);
+
+    auto const new_config = mir_connection_create_display_config(connection);
+    EXPECT_THAT(new_config->outputs->orientation, Eq(configuration->outputs->orientation));
+    mir_display_config_destroy(new_config);
+
+    mir_display_config_destroy(configuration);
+    mir_surface_release_sync(painted_surface);
+    mir_connection_release(connection);
+}