Merge lp://qastaging/~mir-team/mir/trunk-0.1.7 into lp://qastaging/mir/0.1

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp (+8/-0)
CMakeLists.txt (+1/-1)
debian/changelog (+56/-0)
debian/control (+2/-2)
debian/libmirserver17.install (+1/-1)
debian/rules (+5/-3)
examples/CMakeLists.txt (+0/-1)
examples/demo-shell/CMakeLists.txt (+1/-0)
examples/demo-shell/demo_renderer.cpp (+33/-0)
examples/demo-shell/demo_renderer.h (+39/-0)
examples/demo-shell/demo_shell.cpp (+21/-2)
examples/demo-shell/window_manager.cpp (+10/-24)
examples/eglplasma.c (+9/-7)
examples/image_renderer.cpp (+1/-0)
examples/pixel_format_selector.cpp (+2/-7)
examples/render_overlays.cpp (+92/-21)
examples/render_surfaces.cpp (+32/-5)
examples/scroll.cpp (+62/-41)
examples/server_configuration.cpp (+15/-26)
include/platform/mir/graphics/display_configuration.h (+27/-7)
include/platform/mir/graphics/overlapping_output_grouping.h (+3/-7)
include/platform/mir/graphics/renderable.h (+39/-1)
include/platform/mir/options/configuration.h (+0/-1)
include/server/mir/compositor/buffer_stream.h (+2/-1)
include/server/mir/compositor/compositing_criteria.h (+0/-52)
include/server/mir/compositor/display_buffer_compositor.h (+4/-2)
include/server/mir/compositor/gl_renderer.h (+32/-6)
include/server/mir/compositor/renderer.h (+6/-2)
include/server/mir/compositor/scene.h (+3/-4)
include/server/mir/frontend/screencast.h (+3/-1)
include/server/mir/shell/session.h (+0/-1)
include/shared/mir_toolkit/client_types.h (+23/-3)
include/shared/testdraw/draw_pattern_checkered-inl.h (+3/-3)
include/shared/testdraw/graphics_region_factory.h (+4/-4)
include/shared/testdraw/patterns.h (+3/-3)
include/test/mir_test_doubles/fake_renderable.h (+39/-17)
include/test/mir_test_doubles/mock_android_native_buffer.h (+9/-0)
include/test/mir_test_doubles/mock_buffer_bundle.h (+1/-0)
include/test/mir_test_doubles/mock_buffer_stream.h (+1/-0)
include/test/mir_test_doubles/mock_compositing_criteria.h (+0/-45)
include/test/mir_test_doubles/mock_display_device.h (+6/-3)
include/test/mir_test_doubles/mock_gl.h (+3/-2)
include/test/mir_test_doubles/mock_render_function.h (+40/-0)
include/test/mir_test_doubles/mock_render_function.h.moved (+40/-0)
include/test/mir_test_doubles/mock_renderable.h (+14/-1)
include/test/mir_test_doubles/mock_renderer.h (+2/-2)
include/test/mir_test_doubles/mock_scene.h (+48/-0)
include/test/mir_test_doubles/mock_screencast.h (+4/-2)
include/test/mir_test_doubles/mock_swapping_gl_context.h (+39/-0)
include/test/mir_test_doubles/null_display_configuration.h (+1/-1)
include/test/mir_test_doubles/null_screencast.h (+3/-1)
include/test/mir_test_doubles/stub_buffer.h (+16/-4)
include/test/mir_test_doubles/stub_buffer_stream.h (+2/-0)
include/test/mir_test_doubles/stub_display_configuration.h (+6/-1)
include/test/mir_test_doubles/stub_display_device.h (+5/-2)
include/test/mir_test_doubles/stub_renderable.h (+27/-2)
include/test/mir_test_doubles/stub_renderer.h (+2/-2)
include/test/mir_test_doubles/stub_swapping_gl_context.h (+39/-0)
src/client/CMakeLists.txt (+1/-0)
src/client/android/CMakeLists.txt (+9/-2)
src/client/mesa/CMakeLists.txt (+9/-2)
src/client/mir_screencast.cpp (+20/-23)
src/client/mir_screencast.h (+4/-2)
src/client/mir_screencast_api.cpp (+9/-19)
src/client/mir_surface.h (+0/-2)
src/platform/graphics/CMakeLists.txt (+1/-0)
src/platform/graphics/android/CMakeLists.txt (+10/-2)
src/platform/graphics/android/android_display.cpp (+8/-0)
src/platform/graphics/android/android_display_configuration.cpp (+4/-5)
src/platform/graphics/android/android_display_configuration.h (+1/-4)
src/platform/graphics/android/display_buffer.cpp (+10/-16)
src/platform/graphics/android/display_buffer.h (+1/-1)
src/platform/graphics/android/display_device.h (+6/-3)
src/platform/graphics/android/fb_device.cpp (+15/-14)
src/platform/graphics/android/fb_device.h (+5/-3)
src/platform/graphics/android/gl_context.cpp (+12/-0)
src/platform/graphics/android/gl_context.h (+15/-12)
src/platform/graphics/android/hwc_device.cpp (+96/-57)
src/platform/graphics/android/hwc_device.h (+27/-5)
src/platform/graphics/android/hwc_fb_device.cpp (+50/-30)
src/platform/graphics/android/hwc_fb_device.h (+7/-3)
src/platform/graphics/android/hwc_layerlist.cpp (+84/-90)
src/platform/graphics/android/hwc_layerlist.h (+21/-30)
src/platform/graphics/android/hwc_layers.cpp (+41/-11)
src/platform/graphics/android/hwc_layers.h (+7/-4)
src/platform/graphics/android/real_hwc_wrapper.cpp (+53/-0)
src/platform/graphics/android/real_hwc_wrapper.h (+48/-0)
src/platform/graphics/android/resource_factory.cpp (+3/-1)
src/platform/graphics/display_configuration.cpp (+50/-0)
src/platform/graphics/mesa/CMakeLists.txt (+9/-3)
src/platform/graphics/mesa/cursor.cpp (+26/-15)
src/platform/graphics/mesa/cursor.h (+2/-1)
src/platform/graphics/mesa/display.cpp (+7/-1)
src/platform/graphics/mesa/linux_virtual_terminal.cpp (+6/-5)
src/platform/graphics/mesa/linux_virtual_terminal.h (+21/-0)
src/platform/graphics/mesa/native_platform.cpp (+48/-1)
src/platform/graphics/mesa/native_platform.h (+10/-0)
src/platform/graphics/mesa/platform.cpp (+39/-2)
src/platform/graphics/mesa/real_kms_display_configuration.cpp (+6/-34)
src/platform/graphics/mesa/real_kms_display_configuration.h (+1/-4)
src/platform/graphics/overlapping_output_grouping.cpp (+7/-8)
src/platform/options/default_configuration.cpp (+2/-5)
src/server/CMakeLists.txt (+1/-1)
src/server/compositor/buffer_bundle.h (+1/-0)
src/server/compositor/buffer_stream_surfaces.cpp (+5/-0)
src/server/compositor/buffer_stream_surfaces.h (+1/-0)
src/server/compositor/bypass.cpp (+13/-52)
src/server/compositor/bypass.h (+5/-9)
src/server/compositor/compositing_screencast.cpp (+14/-37)
src/server/compositor/compositing_screencast.h (+6/-4)
src/server/compositor/default_configuration.cpp (+7/-4)
src/server/compositor/default_display_buffer_compositor.cpp (+25/-8)
src/server/compositor/default_display_buffer_compositor.h (+2/-1)
src/server/compositor/default_display_buffer_compositor_factory.cpp (+2/-2)
src/server/compositor/gl_renderer.cpp (+45/-57)
src/server/compositor/gl_renderer_factory.cpp (+1/-1)
src/server/compositor/gl_renderer_factory.h (+1/-1)
src/server/compositor/multi_threaded_compositor.cpp (+42/-25)
src/server/compositor/multi_threaded_compositor.h (+5/-3)
src/server/compositor/occlusion.cpp (+12/-32)
src/server/compositor/occlusion.h (+4/-6)
src/server/compositor/rendering_operator.cpp (+9/-5)
src/server/compositor/rendering_operator.h (+5/-3)
src/server/compositor/screencast_display_buffer.cpp (+3/-2)
src/server/compositor/switching_bundle.cpp (+32/-19)
src/server/compositor/switching_bundle.h (+2/-0)
src/server/frontend/session_mediator.cpp (+31/-20)
src/server/graphics/default_configuration.cpp (+28/-31)
src/server/graphics/default_display_configuration_policy.cpp (+9/-10)
src/server/graphics/nested/nested_display.cpp (+43/-34)
src/server/graphics/nested/nested_display_configuration.cpp (+59/-39)
src/server/graphics/nested/nested_display_configuration.h (+1/-5)
src/server/graphics/offscreen/display.cpp (+6/-0)
src/server/graphics/offscreen/display_configuration.cpp (+5/-3)
src/server/graphics/offscreen/display_configuration.h (+1/-5)
src/server/input/default_configuration.cpp (+2/-2)
src/server/input/nested_input_relay.cpp (+34/-55)
src/server/scene/basic_surface.cpp (+26/-41)
src/server/scene/basic_surface.h (+9/-6)
src/server/scene/mediating_display_changer.cpp (+2/-7)
src/server/scene/surface_stack.cpp (+9/-11)
src/shared/CMakeLists.txt (+1/-0)
src/shared/protobuf/mir_protobuf.proto (+9/-1)
src/shared/testdraw/CMakeLists.txt (+2/-0)
src/shared/testdraw/android_graphics_region_factory.cpp (+6/-5)
src/shared/testdraw/mesa_graphics_region_factory.cpp (+5/-5)
src/shared/testdraw/patterns.cpp (+4/-4)
src/utils/screencast.cpp (+161/-76)
tests/CMakeLists.txt (+0/-1)
tests/acceptance-tests/test_client_input.cpp (+38/-0)
tests/acceptance-tests/test_client_screencast.cpp (+72/-39)
tests/acceptance-tests/test_server_shutdown.cpp (+2/-2)
tests/acceptance-tests/test_surfaces_with_output_id.cpp (+4/-10)
tests/integration-tests/client/test_client_render.cpp (+2/-2)
tests/integration-tests/client/test_screencast.cpp (+5/-1)
tests/integration-tests/graphics/android/test_buffer_integration.cpp (+2/-2)
tests/integration-tests/input/CMakeLists.txt (+1/-0)
tests/integration-tests/input/test_nested_input.cpp (+124/-0)
tests/integration-tests/test_session.cpp (+2/-2)
tests/integration-tests/test_surface_first_frame_sync.cpp (+3/-3)
tests/integration-tests/test_swapinterval.cpp (+2/-1)
tests/mir_test/display_config_matchers.cpp (+6/-3)
tests/mir_test_doubles/mock_gl.cpp (+6/-0)
tests/mir_test_framework/stubbed_server_configuration.cpp (+2/-2)
tests/unit-tests/client/test_mir_screencast.cpp (+91/-79)
tests/unit-tests/compositor/test_bypass.cpp (+55/-59)
tests/unit-tests/compositor/test_compositing_screencast.cpp (+31/-20)
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+91/-81)
tests/unit-tests/compositor/test_gl_renderer.cpp (+31/-37)
tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+85/-33)
tests/unit-tests/compositor/test_occlusion.cpp (+24/-27)
tests/unit-tests/compositor/test_rendering_operator.cpp (+13/-13)
tests/unit-tests/compositor/test_screencast_display_buffer.cpp (+17/-0)
tests/unit-tests/draw/test_draw_patterns.cpp (+1/-1)
tests/unit-tests/frontend/test_session_mediator.cpp (+1/-9)
tests/unit-tests/graphics/android/CMakeLists.txt (+1/-0)
tests/unit-tests/graphics/android/hwc_struct_helpers.h (+16/-3)
tests/unit-tests/graphics/android/test_android_fb.cpp (+21/-29)
tests/unit-tests/graphics/android/test_fb_device.cpp (+25/-16)
tests/unit-tests/graphics/android/test_hwc_common_device.cpp (+18/-1)
tests/unit-tests/graphics/android/test_hwc_device.cpp (+528/-117)
tests/unit-tests/graphics/android/test_hwc_display.cpp (+5/-23)
tests/unit-tests/graphics/android/test_hwc_fb_device.cpp (+88/-51)
tests/unit-tests/graphics/android/test_hwc_layerlist.cpp (+36/-196)
tests/unit-tests/graphics/android/test_hwc_layers.cpp (+122/-85)
tests/unit-tests/graphics/android/test_hwc_wrapper.cpp (+119/-0)
tests/unit-tests/graphics/mesa/test_cursor.cpp (+93/-5)
tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp (+27/-37)
tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp (+175/-11)
tests/unit-tests/graphics/mesa/test_native_platform.cpp (+60/-0)
tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp (+4/-7)
tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp (+20/-68)
tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+42/-38)
tests/unit-tests/graphics/test_display.cpp (+34/-0)
tests/unit-tests/graphics/test_display_configuration.cpp (+41/-0)
tests/unit-tests/scene/test_basic_surface.cpp (+2/-28)
tests/unit-tests/scene/test_surface.cpp (+0/-1)
tests/unit-tests/scene/test_surface_stack.cpp (+83/-113)
tests/unit-tests/test_udev_wrapper.cpp (+3/-1)
tools/install_on_android.sh (+1/-1)