lp:~robertcarr/mir/consolidate-default-shell-part-1

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

Daniel van Vugt: Abstain on 2013-12-04

Alan Griffiths: Needs Fixing on 2013-11-21

Kevin DuBois (community): Needs Information on 2013-11-20

PS Jenkins bot (community): Approve (continuous-integration) on 2013-11-19

Diff: 1192 lines (+227/-506)

14 files modified

include/server/mir/default_server_configuration.h (+3/-3)
src/server/shell/CMakeLists.txt (+1/-2)
src/server/shell/default_configuration.cpp (+9/-12)
src/server/shell/default_session_container.cpp (+0/-83)
src/server/shell/default_session_container.h (+0/-52)
src/server/shell/default_shell.cpp (+64/-41)
src/server/shell/default_shell.h (+24/-18)
src/server/shell/session_container.h (+0/-7)
tests/acceptance-tests/test_focus_selection.cpp (+2/-1)
tests/integration-tests/shell/CMakeLists.txt (+0/-1)
tests/integration-tests/shell/test_session_manager.cpp (+0/-127)
tests/unit-tests/shell/CMakeLists.txt (+1/-2)
tests/unit-tests/shell/test_default_shell.cpp (+123/-70)
tests/unit-tests/shell/test_the_session_container_implementation.cpp (+0/-87)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1234. By Robert Carr on 2013-11-19

Removesomeredundancy in unit tests

1233. By Robert Carr on 2013-11-19

Default shell integration tests with session container are now unit tests

1232. By Robert Carr on 2013-11-19

Fold session container in to default shell

1231. By Robert Carr on 2013-11-18

Hide default shell

1230. By Robert Carr on 2013-11-18

Rename SessionManager to DefaultShell

1229. By Alexandros Frantzis on 2013-11-18

client,frontend: Report the real available surface pixel formats to clients. Fixes: https://bugs.launchpad.net/bugs/1240833.

Approved by PS Jenkins bot, Daniel van Vugt, Alan Griffiths, Kevin DuBois.

1228. By Kevin DuBois on 2013-11-18

graphics: android:
1) change hwc1.1 to make use of sync fences during the compositor's gl renderloop. Note that we no longer wait for the render to complete, we pass this responsibility to the driver and the kernel.

2) support nexus 10. Fixes: https://bugs.launchpad.net/bugs/1252173.

Approved by Daniel van Vugt, PS Jenkins bot, Alexandros Frantzis, Alan Griffiths.

1227. By Alan Griffiths on 2013-11-18

shell: don't publish SurfacesContainer - it can be private to shell.

Approved by Daniel van Vugt, PS Jenkins bot, Alexandros Frantzis.

1226. By Alexandros Frantzis on 2013-11-17

gbm: Don't mess up the VT mode on setup failure

Only restore the previous VT mode during shutdown if it was VT_AUTO. VT_PROCESS
mode is always bound to the calling process, so "restoring" VT_PROCESS will not
work; it will just bind the notification signals to our process again.

Not "restoring" VT_PROCESS also ensures we don't mess up the VT state of the
previous controlling process, in case it had set VT_PROCESS and we fail during
setup. This could happen, for example, when trying to start Mir from inside an
X session.

Approved by PS Jenkins bot, Alan Griffiths.

1225. By Michael Terry on 2013-11-15

Fix a crash due to a failed eglMakeCurrent() call when in nested mode.