lp:~alan-griffiths/mir/fix-1535894-alt

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:mir

PS Jenkins bot (community): Approve (continuous-integration) on 2016-02-11

Mir CI Bot: Approve (continuous-integration) on 2016-02-11

Daniel van Vugt: Needs Fixing on 2016-02-11

Diff: 984 lines (+181/-263)

26 files modified

examples/render_surfaces.cpp (+3/-2)
examples/server_example_adorning_compositor.cpp (+12/-1)
examples/server_example_adorning_compositor.h (+1/-1)
include/server/mir/compositor/display_buffer_compositor.h (+1/-1)
include/server/mir/compositor/scene.h (+0/-10)
include/server/mir/compositor/scene_element.h (+1/-0)
include/test/mir/test/doubles/null_display_buffer_compositor_factory.h (+2/-1)
playground/demo-shell/demo_compositor.cpp (+13/-1)
playground/demo-shell/demo_compositor.h (+1/-1)
src/server/compositor/default_display_buffer_compositor.cpp (+43/-46)
src/server/compositor/default_display_buffer_compositor.h (+1/-1)
src/server/compositor/multi_threaded_compositor.cpp (+3/-11)
src/server/scene/rendering_tracker.cpp (+9/-0)
src/server/scene/rendering_tracker.h (+1/-0)
src/server/scene/surface_stack.cpp (+10/-24)
src/server/scene/surface_stack.h (+0/-1)
tests/acceptance-tests/test_buffer_stream_arrangement.cpp (+2/-2)
tests/acceptance-tests/test_client_scaling.cpp (+2/-1)
tests/acceptance-tests/test_render_override.cpp (+3/-1)
tests/include/mir/test/doubles/stub_scene.h (+0/-4)
tests/include/mir/test/doubles/stub_scene_element.h (+5/-0)
tests/integration-tests/test_server_shutdown.cpp (+1/-1)
tests/unit-tests/compositor/test_compositing_screencast.cpp (+4/-3)
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+44/-10)
tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+19/-22)
tests/unit-tests/scene/test_surface_stack.cpp (+0/-118)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3303. By Alan Griffiths on 2016-02-11

Remove some unused headers

3302. By Alan Griffiths on 2016-02-11

Reinstate FIXME comment

3301. By Alan Griffiths on 2016-02-11

merge lp:mir

3300. By Alan Griffiths on 2016-02-08

Cleaner code in examples

3299. By Alan Griffiths on 2016-02-08

Cleaner code (that also passes StaleFrames.* tests)

3298. By Alan Griffiths on 2016-02-05

Add corresponding DefaultDisplayBufferCompositor tests

3297. By Alan Griffiths on 2016-02-05

Remove unnecessary Scene::frames_pending()

3296. By Alan Griffiths on 2016-02-05

Fixup broken test

3295. By Alan Griffiths on 2016-02-05

First pass at pending buffer count

3294. By Alan Griffiths on 2016-02-04

frontend: replace configurable "IPC thread pool" with a single thread.

Approved by Daniel van Vugt, mir-ci-bot, PS Jenkins bot, Kevin DuBois.