← Back to branch summary

~vanvugt/mir/remove-input-resampling-standalone

~vanvugt/mir/remove-input-resampling-standalone

Viewing all changes in revision 3923.

Committer: Daniel van Vugt
Date: 2017-01-13 04:51:47 UTC
mfrom: (3906.2.25 mir-dev)
Revision ID: daniel.van.vugt@canonical.com-20170113045147-s010u5gjww5f2md7

Merge latest trunk

files added:
include/test/mir_test_framework/stub_client_platform_options.h

src/include/client/mir/platform_message.h

tests/mir_test_framework/stub_client_platform_options.cpp

files removed:
include/test/mir_test_framework/using_stub_client_platform.h

src/client/mir_connection_api.h

tests/acceptance-tests/staging

tests/acceptance-tests/staging/CMakeLists.txt

tests/acceptance-tests/throwback

tests/acceptance-tests/throwback/CMakeLists.txt

tests/include/mir_test_framework/using_client_platform.h

tests/mir_test_framework/using_stub_client_platform.cpp

files renamed:
tests/include/mir/test/death.h => include/test/mir/test/death.h

tests/acceptance-tests/staging/test_buffer_stream_arrangement.cpp => tests/acceptance-tests/test_buffer_stream_arrangement1.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp => tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp => tests/acceptance-tests/test_client_library_errors.cpp

tests/acceptance-tests/staging/test_presentation_chain.cpp => tests/acceptance-tests/test_presentation_chain.cpp

tests/acceptance-tests/staging/test_render_surface.cpp => tests/acceptance-tests/test_render_surface.cpp

tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp => tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

files modified:
include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_platform_message.h

src/client/mir_connection.cpp

src/client/mir_connection_api.cpp

src/client/mir_debug_api.cpp

src/client/mir_platform_message_api.cpp

src/client/symbols.map

src/include/client/mir/egl_native_surface.h

src/include/client/mir_toolkit/extensions/android_egl.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/egl_native_surface_interpreter.cpp

src/platforms/android/client/egl_native_surface_interpreter.h

src/platforms/android/common/mir_native_window.cpp

src/platforms/android/include/android_driver_interpreter.h

src/platforms/android/server/server_render_window.cpp

src/platforms/android/server/server_render_window.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/buffer_allocator.h

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/mir_client_host_connection.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_callbacks.cpp

tests/acceptance-tests/test_client_platform_operation.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_prompt_session_client_api.cpp

tests/acceptance-tests/test_server_disconnect.cpp

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

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

tests/include/mir_test_framework/basic_client_server_fixture.h

tests/include/mir_test_framework/stub_client_platform_factory.h

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_large_messages.cpp

tests/integration-tests/test_protobuf.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_submit_buffer.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/stub_client_platform_factory.cpp

tests/mir_test_framework/stub_client_platform_module.cpp

tests/mir_test_framework/symbols-client.map

tests/unit-tests/client/test_mir_connection.cpp

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

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

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

tests/unit-tests/platforms/mesa/kms/test_buffer_allocator.cpp

Show diffs side-by-side

added added

removed removed

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_platform_message.h

include/test/mir_test_framework/stub_client_platform_options.h

include/test/mir_test_framework/using_stub_client_platform.h

src/client/mir_connection.cpp

src/client/mir_connection_api.cpp

src/client/mir_connection_api.h

src/client/mir_debug_api.cpp

src/client/mir_platform_message_api.cpp

src/client/symbols.map

src/include/client/mir/egl_native_surface.h

src/include/client/mir/platform_message.h

src/include/client/mir_toolkit/extensions/android_egl.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/egl_native_surface_interpreter.cpp

src/platforms/android/client/egl_native_surface_interpreter.h

src/platforms/android/common/mir_native_window.cpp

src/platforms/android/include/android_driver_interpreter.h

src/platforms/android/server/server_render_window.cpp

src/platforms/android/server/server_render_window.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/buffer_allocator.h

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/mir_client_host_connection.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/staging/

tests/acceptance-tests/staging/CMakeLists.txt

tests/acceptance-tests/test_buffer_stream_arrangement1.cpp

tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_callbacks.cpp

tests/acceptance-tests/test_client_library_errors.cpp

tests/acceptance-tests/test_client_platform_operation.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_prompt_session_client_api.cpp

tests/acceptance-tests/test_render_surface.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/throwback/

tests/acceptance-tests/throwback/CMakeLists.txt

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

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

tests/include/mir_test_framework/basic_client_server_fixture.h

tests/include/mir_test_framework/stub_client_platform_factory.h

tests/include/mir_test_framework/using_client_platform.h

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_large_messages.cpp

tests/integration-tests/test_protobuf.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_submit_buffer.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/stub_client_platform_factory.cpp

tests/mir_test_framework/stub_client_platform_module.cpp

tests/mir_test_framework/stub_client_platform_options.cpp

tests/mir_test_framework/symbols-client.map

tests/mir_test_framework/using_stub_client_platform.cpp

tests/unit-tests/client/test_mir_connection.cpp

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

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

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

tests/unit-tests/platforms/mesa/kms/test_buffer_allocator.cpp

Older »