lp://staging/~kdub/mir/sort-out-surface-observers

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/mir

Daniel van Vugt: Abstain on 2015-06-29

Robert Carr (community): Approve on 2015-06-24

Alan Griffiths: Needs Information on 2015-06-12

PS Jenkins bot (community): Approve (continuous-integration) on 2015-06-10

Diff: 989 lines (+376/-66)

31 files modified

include/server/mir/frontend/buffer_stream.h (+3/-3)
include/server/mir/scene/null_stream_observer.h (+36/-0)
include/server/mir/scene/null_surface_observer.h (+1/-1)
include/server/mir/scene/stream_observer.h (+45/-0)
include/server/mir/scene/surface.h (+2/-0)
include/server/mir/scene/surface_observer.h (+1/-1)
include/server/mir/shell/surface_ready_observer.h (+3/-2)
src/include/server/mir/scene/stream_observers.h (+43/-0)
src/include/server/mir/scene/surface_observers.h (+1/-1)
src/server/compositor/buffer_stream_surfaces.cpp (+2/-2)
src/server/compositor/buffer_stream_surfaces.h (+4/-4)
src/server/input/cursor_controller.cpp (+0/-4)
src/server/scene/CMakeLists.txt (+1/-0)
src/server/scene/basic_surface.cpp (+54/-15)
src/server/scene/basic_surface.h (+5/-0)
src/server/scene/legacy_scene_change_notification.cpp (+3/-2)
src/server/scene/legacy_stream_change_notification.cpp (+37/-0)
src/server/scene/legacy_stream_change_notification.h (+45/-0)
src/server/scene/legacy_surface_change_notification.cpp (+4/-6)
src/server/scene/legacy_surface_change_notification.h (+2/-5)
src/server/scene/null_surface_observer.cpp (+5/-1)
src/server/scene/stream_change_notification.h (+45/-0)
src/server/shell/surface_ready_observer.cpp (+4/-0)
src/server/symbols.map (+8/-2)
tests/include/mir_test_doubles/mock_buffer_stream.h (+2/-2)
tests/include/mir_test_doubles/mock_surface.h (+2/-0)
tests/include/mir_test_doubles/stub_buffer_stream.h (+2/-2)
tests/include/mir_test_doubles/stub_scene_surface.h (+2/-0)
tests/unit-tests/compositor/test_buffer_stream.cpp (+2/-3)
tests/unit-tests/scene/test_basic_surface.cpp (+1/-1)
tests/unit-tests/scene/test_legacy_scene_change_notification.cpp (+11/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2642. By Kevin DuBois on 2015-06-10

remove a dup symbol from the table

2641. By Kevin DuBois on 2015-06-10

merge in mir

2640. By Kevin DuBois on 2015-06-09

round of cleanups

2639. By Kevin DuBois on 2015-06-09

shift around files

2638. By Kevin DuBois on 2015-06-09

sort out observers with resetting the streams

2637. By Kevin DuBois on 2015-06-09

merge in mir

2636. By Kevin DuBois on 2015-06-08

tests to pass

2635. By Kevin DuBois on 2015-06-08

merge in mir

2634. By Kevin DuBois on 2015-06-08

transition most things to having a separate stream and surface notification path

2633. By Alberto Aguirre on 2015-06-08

Bump MIRPLATFORM_ABI version.

Approved by Daniel van Vugt, PS Jenkins bot, Cemil Azizoglu.