lp:~vanvugt/mir/wire-up-SurfaceController

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

Alan Griffiths: Disapprove on 2015-01-20

PS Jenkins bot (community): Approve (continuous-integration) on 2015-01-15

Robert Carr (community): Disapprove on 2015-01-13

Diff: 249 lines (+54/-9)

15 files modified

include/server/mir/frontend/session.h (+1/-0)
include/server/mir/scene/surface_coordinator.h (+2/-1)
include/server/mir/shell/surface_coordinator_wrapper.h (+1/-1)
server-ABI-sha1sums (+3/-3)
src/server/frontend/session_mediator.cpp (+1/-2)
src/server/scene/application_session.cpp (+9/-0)
src/server/scene/application_session.h (+1/-0)
src/server/scene/surface_controller.cpp (+9/-0)
src/server/scene/surface_controller.h (+3/-1)
src/server/shell/surface_coordinator_wrapper.cpp (+7/-0)
src/server/symbols.map (+1/-0)
tests/include/mir_test_doubles/mock_surface_coordinator.h (+2/-1)
tests/include/mir_test_doubles/stub_scene_session.h (+5/-0)
tests/include/mir_test_doubles/stub_session.h (+5/-0)
tests/unit-tests/scene/test_application_session.cpp (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2220. By Daniel van Vugt on 2015-01-15

Merge latest trunk

2219. By Daniel van Vugt on 2015-01-15

Revert back to r2216, which at least works.

The problem is only ApplicationSession knows how to convert a SurfaceId
into a scene::Surface to pass to SurfaceCoordinator/SurfaceController.
So we go through ApplicationSession.

2218. By Daniel van Vugt on 2015-01-15

More work in progress.

Still doesn't build because the frontend doesn't (and shouldn't?) know how
to convert a frontend::Surface into a scene::Surface for SurfaceController.

2217. By Daniel van Vugt on 2015-01-15

Start removing Session from the Controller path

2216. By Daniel van Vugt on 2015-01-15

Merge latest trunk

2215. By Daniel van Vugt on 2015-01-15

Merge latest trunk

2214. By Daniel van Vugt on 2015-01-14

Merge latest trunk and fix a conflict.

2213. By Daniel van Vugt on 2015-01-13

Update sha1sums

2212. By Daniel van Vugt on 2015-01-13

Backport SurfaceController wiring from the 'states' branch, with all
WM code removed.

2211. By Kevin DuBois on 2015-01-09

android: provide an interface in HwcWrapper for the mir code to subscribe to the driver callbacks. The callback reception was previously buried within the HwcCommonDevice class, but now we need it to see hotplug events and drive the display changes.

Also subsume hwc_device_composer_device_1 under HwcWrapper. (it was previously only partially wrapped).
.

Approved by PS Jenkins bot, Alberto Aguirre, Robert Carr.