Merge lp:~alan-griffiths/mir/revert-c2238 into lp:mir

[Alan Griffiths]

shell: republish FocusSetter

shell: republish FocusSetter

I was wrong: this is used by qtmir (but I still want to get rid if it as it still doesn't make sense)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2249
http://jenkins.qa.ubuntu.com/job/mir-ci/2776/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/974
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/773
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/773/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/974
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/974/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4061
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17363

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Unless we're planning to release soon I'd prefer not landing this.

C.f. lp:~alan-griffiths/mir/MVC-cleanup-of-FocusSetter/+merge/247054

review: Needs Information

[Daniel van Vugt (vanvugt)]

Confused now.

review: Abstain

[Alan Griffiths (alan-griffiths)]

Folks seem happy to press on with the MVC series and hope we don't need this. => Rejected

Unmerged revisions

2249. By Alan Griffiths on 2015-01-22

merge -r2238..2237 ..

=== modified file 'include/server/mir/server.h'
--- include/server/mir/server.h	2015-01-19 11:40:40 +0000
+++ include/server/mir/server.h	2015-01-22 14:28:33 +0000
@@ -33,7 +33,7 @@
 namespace input { class CompositeEventFilter; class InputDispatcher; class CursorListener; class TouchVisualizer; }
 namespace logging { class Logger; }
 namespace options { class Option; }
-namespace shell { class FocusController; class DisplayLayout; class HostLifecycleEventListener; }
+namespace shell { class FocusController; class FocusSetter; class DisplayLayout; class HostLifecycleEventListener; }
 namespace scene
 {
 class PlacementStrategy;
@@ -241,6 +241,9 @@
     /// Sets an override functor for creating the session mediator report.
     void override_the_session_mediator_report(Builder<frontend::SessionMediatorReport> const& session_mediator_builder);
 
+    /// Sets an override functor for creating the shell focus setter.
+    void override_the_shell_focus_setter(Builder<shell::FocusSetter> const& focus_setter_builder);
+
     /// Sets an override functor for creating the surface configurator.
     void override_the_surface_configurator(Builder<scene::SurfaceConfigurator> const& surface_configurator_builder);
 
 
=== renamed file 'src/include/server/mir/shell/focus_setter.h' => 'include/server/mir/shell/focus_setter.h'
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums	2015-01-22 03:10:13 +0000
+++ server-ABI-sha1sums	2015-01-22 14:28:33 +0000
@@ -101,10 +101,11 @@
 aceccc0bdeea5c90d6c5ea17ed4ce6b5dc1b0ed4  include/server/mir/scene/surface.h
 587e22d751656ce2d9536afdf5659276ff9bbc46  include/server/mir/scene/surface_observer.h
 7ef3e99901168cda296d74d05a979f47bf9c3ff1  include/server/mir/server_action_queue.h
-9ebaf52d83b27063498eda8481dd4e53213e98f8  include/server/mir/server.h
+3f61714a65f816acbd26377e31222c410527753a  include/server/mir/server.h
 86098b500339bfccd07a9bed8298f75a68b18f5c  include/server/mir/server_status_listener.h
 860c04f32b60e680140148dc9dc2295de145b9c1  include/server/mir/shell/display_layout.h
 6a2107b01feae13060d5c305804906e53c52e0be  include/server/mir/shell/focus_controller.h
+b74342d8ffab489405a4e12fce0c257ac9f8596c  include/server/mir/shell/focus_setter.h
 f8d415af54b4a477338fb9dbe20db01aa4544029  include/server/mir/shell/host_lifecycle_event_listener.h
 4f50c37bb8e36a1aa4918af6aa01b0f032ed0984  include/server/mir/shell/input_targeter.h
 a46723e246b4cb6619cf8abbedb02c3391f563c9  include/server/mir/shell/session_coordinator_wrapper.h
 
=== modified file 'src/server/server.cpp'
--- src/server/server.cpp	2015-01-19 11:40:40 +0000
+++ src/server/server.cpp	2015-01-22 14:28:33 +0000
@@ -61,6 +61,7 @@
     MACRO(session_authorizer)\
     MACRO(session_listener)\
     MACRO(session_mediator_report)\
+    MACRO(shell_focus_setter)\
     MACRO(surface_configurator)
 
 #define FOREACH_ACCESSOR(MACRO)\
 
=== modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp'
--- tests/acceptance-tests/test_client_surface_visibility.cpp	2015-01-19 12:32:12 +0000
+++ tests/acceptance-tests/test_client_surface_visibility.cpp	2015-01-22 14:28:33 +0000
@@ -20,6 +20,7 @@
 
 #include "mir/scene/surface.h"
 #include "mir/shell/surface_coordinator_wrapper.h"
+#include "mir/shell/focus_setter.h"
 
 #include "mir_test_framework/connected_client_with_a_surface.h"
 #include "mir_test/wait_condition.h"
@@ -39,6 +40,7 @@
 
 namespace
 {
+
 class StoringSurfaceCoordinator : public msh::SurfaceCoordinatorWrapper
 {
 public:
@@ -58,17 +60,6 @@
         return surfaces[index].lock();
     }
 
-    void raise(std::weak_ptr<ms::Surface> const& /*surface*/) override
-    {
-         // We get some racy "raise" requests from the DefaultFocusManagement
-         // so we ignore any raise requests that we don't issue ourselves
-    }
-
-    void raise(int index)
-    {
-         msh::SurfaceCoordinatorWrapper::raise(surface(index));
-    }
-
 private:
     std::vector<std::weak_ptr<ms::Surface>> surfaces;
 
@@ -97,12 +88,24 @@
 
     void SetUp() override
     {
-        server.wrap_surface_coordinator([&]
+        server.wrap_surface_coordinator([]
             (std::shared_ptr<ms::SurfaceCoordinator> const& wrapped)
             {
-                auto const result = std::make_shared<StoringSurfaceCoordinator>(wrapped);
-                storing_surface_coordinator = result;
-                return result;
+                return std::make_shared<StoringSurfaceCoordinator>(wrapped);
+            });
+
+        /*
+         * Use a null focus setter so that it doesn't change the surface
+         * order and introduce races to our tests.
+         */
+        server.override_the_shell_focus_setter([]
+            {
+                struct NullFocusSetter : msh::FocusSetter
+                {
+                    void set_focus_to(std::shared_ptr<ms::Session> const&) override {}
+                };
+
+                return std::make_shared<NullFocusSetter>();
             });
 
         mtf::ConnectedClientWithASurface::SetUp();
@@ -134,14 +137,17 @@
     
         mir_surface_spec_release(spec);
 
-        storing_surface_coordinator.lock()->raise(1);
+        server.the_surface_coordinator()->raise(server_surface(1));
 
         mir_surface_swap_buffers_sync(second_surface);
     }
 
     std::shared_ptr<ms::Surface> server_surface(size_t index)
     {
-        return storing_surface_coordinator.lock()->surface(index);
+        auto const storing_surface_coordinator =
+            std::dynamic_pointer_cast<StoringSurfaceCoordinator>(server.the_surface_coordinator());
+
+        return storing_surface_coordinator->surface(index);
     }
 
     void move_surface_off_screen()
@@ -156,7 +162,7 @@
 
     void raise_surface_on_top()
     {
-        storing_surface_coordinator.lock()->raise(0);
+        server.the_surface_coordinator()->raise(server_surface(0));
     }
 
     void expect_surface_visibility_event_after(
@@ -184,7 +190,6 @@
 
     MirSurface* second_surface = nullptr;
     testing::NiceMock<MockVisibilityCallback> mock_visibility_callback;
-    std::weak_ptr<StoringSurfaceCoordinator> storing_surface_coordinator;
 };
 
 }