lp://qastaging/~vanvugt/mir/privatize-surfaces-Surface

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/mir

Daniel van Vugt: Disapprove on 2013-11-08

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

Alexandros Frantzis (community): Needs Information on 2013-10-29

Alan Griffiths: Needs Information on 2013-10-25

Mir development team: Pending (discussion) requested 2013-10-24

Diff: 361 lines (+40/-28)

21 files modified

CMakeLists.txt (+7/-0)
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+0/-1)
examples/render_surfaces.cpp (+3/-1)
include/server/mir/shell/surface.h (+9/-1)
include/test/mir_test_doubles/stub_surface_builder.h (+1/-1)
src/server/CMakeLists.txt (+6/-1)
src/server/logging/surfaces_report.cpp (+1/-1)
src/server/shell/surface.cpp (+1/-1)
src/server/surfaces/surface.cpp (+1/-1)
src/server/surfaces/surface_allocator.cpp (+1/-1)
src/server/surfaces/surface_stack.cpp (+1/-1)
tests/CMakeLists.txt (+6/-1)
tests/integration-tests/shell/test_session_manager.cpp (+0/-3)
tests/unit-tests/frontend/test_session_mediator.cpp (+0/-2)
tests/unit-tests/shell/test_default_focus_mechanism.cpp (+0/-3)
tests/unit-tests/shell/test_registration_order_focus_sequence.cpp (+0/-3)
tests/unit-tests/shell/test_session_manager.cpp (+0/-2)
tests/unit-tests/shell/test_surface.cpp (+1/-1)
tests/unit-tests/shell/test_the_session_container_implementation.cpp (+0/-1)
tests/unit-tests/surfaces/test_surface.cpp (+1/-1)
tests/unit-tests/surfaces/test_surface_stack.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1120. By Daniel van Vugt on 2013-11-05

Merge latest development-branch

1119. By Daniel van Vugt on 2013-11-04

Merge latest development-branch and resolve conflicts.

1118. By Daniel van Vugt on 2013-11-01

Merge latest development-branch

1117. By Daniel van Vugt on 2013-10-30

Merge latest development-branch

1116. By Daniel van Vugt on 2013-10-29

Merge latest development-branch.

1115. By Daniel van Vugt on 2013-10-25

Fix FTBFS due to recent commits that landed last night

1114. By Daniel van Vugt on 2013-10-25

Merge latest development-branch and fix conflicts.

1113. By Daniel van Vugt on 2013-10-24

Add some nice clear global variables to point you to the server include
directories.

1112. By Daniel van Vugt on 2013-10-24

Start a "protected" include subtree for the server, where to keep headers
that are shared between server components, but not publicly.

1111. By Daniel van Vugt on 2013-10-24

Merge latest development-branch.