lp:~mterry/mir/session-for-surface

Branch merges

Propose for merging

Merged into lp:~mir-team/mir/trunk at revision 951

Alan Griffiths: Abstain on 2013-08-09

PS Jenkins bot (community): Approve (continuous-integration) on 2013-08-09

Kevin DuBois (community): Abstain on 2013-08-01

Robert Carr (community): Approve on 2013-07-30

Robert Ancell: Approve on 2013-07-29

Diff: 691 lines (+87/-42)

23 files modified

examples/render_surfaces.cpp (+1/-0)
include/server/mir/shell/organising_surface_factory.h (+2/-0)
include/server/mir/shell/surface.h (+2/-0)
include/server/mir/shell/surface_builder.h (+2/-1)
include/server/mir/shell/surface_factory.h (+2/-0)
include/server/mir/shell/surface_source.h (+2/-0)
include/server/mir/surfaces/surface_controller.h (+6/-1)
include/test/mir_test_doubles/mock_surface.h (+2/-2)
include/test/mir_test_doubles/mock_surface_factory.h (+2/-1)
include/test/mir_test_doubles/stub_surface_builder.h (+1/-1)
src/server/shell/application_session.cpp (+1/-1)
src/server/shell/organising_surface_factory.cpp (+2/-1)
src/server/shell/surface.cpp (+2/-1)
src/server/shell/surface_source.cpp (+2/-1)
src/server/surfaces/surface_controller.cpp (+2/-1)
tests/acceptance-tests/test_client_input.cpp (+3/-2)
tests/integration-tests/graphics/android/test_internal_client.cpp (+1/-1)
tests/unit-tests/shell/test_application_session.cpp (+10/-10)
tests/unit-tests/shell/test_default_focus_mechanism.cpp (+2/-2)
tests/unit-tests/shell/test_organising_surface_factory.cpp (+5/-5)
tests/unit-tests/shell/test_session_manager.cpp (+6/-4)
tests/unit-tests/shell/test_surface.cpp (+28/-6)
tests/unit-tests/surfaces/test_surface_controller.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1200035: Should expose the session that a new surface is for

Medium

Fix Released

Link a bug report

Related blueprints

839. By Michael Terry on 2013-08-09

Merge from trunk

838. By Michael Terry on 2013-07-29

Merge from trunk

837. By Michael Terry on 2013-07-18

Fix compile errors

836. By Michael Terry on 2013-07-18

Merge from trunk

835. By Michael Terry on 2013-07-12

Merge from trunk

834. By Michael Terry on 2013-07-12

Use raw pointers instead of fancy-pants shared_ptrs

833. By Michael Terry on 2013-07-12

Provide pointer to session when creating surfaces

832. By Alan Griffiths on 2013-07-09

frontend: remove redundant and misleading comment.

Approved by Kevin DuBois, Alexandros Frantzis, PS Jenkins bot.

831. By Daniel van Vugt on 2013-07-09

Work around GCC issue 50043 which is causing build failures on raring.
(LP: #1199210)

The gcc bug is only fixed in 4.8/saucy. Fixes: https://bugs.launchpad.net/bugs/1199210.

Approved by Alan Griffiths, PS Jenkins bot.

830. By Chris Halse Rogers on 2013-07-09

I like clang's error messages. Let's keep Mir building on clang.

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot, Robert Ancell.