← Back to branch summary

~brandontschaefer/mir/deprecate-set-event-handler

~brandontschaefer/mir/deprecate-set-event-handler

Viewing all changes in revision 3906.1.5.

Committer: Brandon Schaefer
Date: 2017-01-07 02:30:53 UTC
mfrom: (3882.5.81 mir-dev)
mto: This revision was merged to the branch mainline in revision 3909.
Revision ID: brandon.schaefer@canonical.com-20170107023053-hxkulj5xsfm47zzf

* Merge parent fix conflict

files modified:
benchmarks/frame-uniformity/touch_measuring_client.cpp

examples/animated_cursor_demo_client.c

examples/basic.c

examples/camera.c

examples/client_helpers.cpp

examples/client_helpers.h

examples/client_touch_validator.cpp

examples/cursors_demo_client.c

examples/demo_client_display_config.c

examples/eglapp.c

examples/eglapp.h

examples/eglsquare.cpp

examples/eglstateswitcher.c

examples/fingerpaint.c

examples/flicker.c

examples/input_shapes.cpp

examples/multi_stream.cpp

examples/multiwin.c

examples/pointer_confinement.c

examples/progressbar.c

examples/prompt_session.c

examples/release_at_exit.c

examples/target.c

examples/tooltip.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/mir_cursor_configuration.h

include/client/mir_toolkit/mir_display_configuration.h

include/client/mir_toolkit/mir_screencast.h

include/client/mir_toolkit/mir_surface.h

include/platforms/mesa/mir_toolkit/mesa/native_display.h

include/test/mir_test_framework/connected_client_with_a_surface.h

include/test/mir_test_framework/visible_surface.h

playground/egldiamond_render_surface.c

playground/mir_demo_client_chain_jumping_buffers.c

playground/mir_demo_client_prerendered_frames.c

playground/render_surface.cpp

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/error_stream.cpp

src/client/error_stream.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_render_surface_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/screencast_stream.cpp

src/client/screencast_stream.h

src/client/symbols.map

src/include/client/mir/egl_native_surface.h

src/include/client/mir/mir_buffer_stream.h

src/include/client/mir_toolkit/mir_presentation_chain.h

src/include/client/mir_toolkit/mir_render_surface.h

src/platforms/android/utils/test_android_hardware_sanity.cpp

src/platforms/mesa/client/native_surface.cpp

src/platforms/mesa/client/native_surface.h

src/server/graphics/nested/host_surface_spec.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/utils/ping.c

src/utils/vanity.c

tests/acceptance-tests/staging/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/staging/test_presentation_chain.cpp

tests/acceptance-tests/staging/test_render_surface.cpp

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_callbacks.cpp

tests/acceptance-tests/test_client_library_old.cpp

tests/acceptance-tests/test_client_logging.cpp

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_debug_api.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_input.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_new_display_configuration.cpp

tests/acceptance-tests/test_persistent_surface_store.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/acceptance-tests/test_render_override.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/test_server_without_active_outputs.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/acceptance-tests/test_surface_morphing.cpp

tests/acceptance-tests/test_surface_placement.cpp

tests/acceptance-tests/test_surface_raise.cpp

tests/acceptance-tests/test_surface_specification.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/acceptance-tests/test_system_compositor_window_manager.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp

tests/include/mir/test/doubles/mock_egl_native_surface.h

tests/include/mir/test/doubles/mock_mir_buffer_stream.h

tests/include/mir/test/doubles/stub_host_connection.h

tests/integration-tests/client/test_mirsurface.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_focus_selection.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_submit_buffer.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test/validity_matchers.cpp

tests/mir_test_framework/any_surface.cpp

tests/mir_test_framework/connected_client_with_a_surface.cpp

tests/mir_test_framework/visible_surface.cpp

tests/performance-tests/test_client_startup.cpp

tests/privileged-tests/test_input_events.cpp

tests/test-clients/impolite-shutdown/scroll.cpp

tests/test-clients/mir-stress/src/client.cpp

tests/unit-tests/client/test_client.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp

tests/unit-tests/platforms/mesa/client/test_native_surface.cpp

Show diffs side-by-side

added added

removed removed

benchmarks/frame-uniformity/touch_measuring_client.cpp

examples/animated_cursor_demo_client.c

examples/basic.c

examples/camera.c

examples/client_helpers.cpp

examples/client_helpers.h

examples/client_touch_validator.cpp

examples/cursors_demo_client.c

examples/demo_client_display_config.c

examples/eglapp.c

examples/eglapp.h

examples/eglsquare.cpp

examples/eglstateswitcher.c

examples/fingerpaint.c

examples/flicker.c

examples/input_shapes.cpp

examples/multi_stream.cpp

examples/multiwin.c

examples/pointer_confinement.c

examples/progressbar.c

examples/prompt_session.c

examples/release_at_exit.c

examples/target.c

examples/tooltip.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/mir_cursor_configuration.h

include/client/mir_toolkit/mir_display_configuration.h

include/client/mir_toolkit/mir_screencast.h

include/client/mir_toolkit/mir_surface.h

include/platforms/mesa/mir_toolkit/mesa/native_display.h

include/test/mir_test_framework/connected_client_with_a_surface.h

include/test/mir_test_framework/visible_surface.h

playground/egldiamond_render_surface.c

playground/mir_demo_client_chain_jumping_buffers.c

playground/mir_demo_client_prerendered_frames.c

playground/render_surface.cpp

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/error_stream.cpp

src/client/error_stream.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_render_surface_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/screencast_stream.cpp

src/client/screencast_stream.h

src/client/symbols.map

src/include/client/mir/egl_native_surface.h

src/include/client/mir/mir_buffer_stream.h

src/include/client/mir_toolkit/mir_presentation_chain.h

src/include/client/mir_toolkit/mir_render_surface.h

src/platforms/android/utils/test_android_hardware_sanity.cpp

src/platforms/mesa/client/native_surface.cpp

src/platforms/mesa/client/native_surface.h

src/server/graphics/nested/host_surface_spec.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/utils/ping.c

src/utils/vanity.c

tests/acceptance-tests/staging/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/staging/test_presentation_chain.cpp

tests/acceptance-tests/staging/test_render_surface.cpp

tests/acceptance-tests/test_buffer_stream_arrangement.cpp

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_callbacks.cpp

tests/acceptance-tests/test_client_library_old.cpp

tests/acceptance-tests/test_client_logging.cpp

tests/acceptance-tests/test_client_scaling.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_debug_api.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_input.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_new_display_configuration.cpp

tests/acceptance-tests/test_persistent_surface_store.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/acceptance-tests/test_render_override.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/test_server_without_active_outputs.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/acceptance-tests/test_surface_morphing.cpp

tests/acceptance-tests/test_surface_placement.cpp

tests/acceptance-tests/test_surface_raise.cpp

tests/acceptance-tests/test_surface_specification.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/acceptance-tests/test_system_compositor_window_manager.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp

tests/include/mir/test/doubles/mock_egl_native_surface.h

tests/include/mir/test/doubles/mock_mir_buffer_stream.h

tests/include/mir/test/doubles/stub_host_connection.h

tests/integration-tests/client/test_mirsurface.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_focus_selection.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_submit_buffer.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test/validity_matchers.cpp

tests/mir_test_framework/any_surface.cpp

tests/mir_test_framework/connected_client_with_a_surface.cpp

tests/mir_test_framework/visible_surface.cpp

tests/performance-tests/test_client_startup.cpp

tests/privileged-tests/test_input_events.cpp

tests/test-clients/impolite-shutdown/scroll.cpp

tests/test-clients/mir-stress/src/client.cpp

tests/unit-tests/client/test_client.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp

tests/unit-tests/platforms/mesa/client/test_native_surface.cpp

Older »