← Back to branch summary

~andreas-pokorny/mir/fix-1639749

~andreas-pokorny/mir/fix-1639749

Viewing all changes in revision 3818.

Committer: Andreas Pokorny
Date: 2016-11-23 15:19:12 UTC
mfrom: (3814.2.27 development-branch)
Revision ID: andreas.pokorny@canonical.com-20161123151912-f03d7u07hhvzsymi

merge changes in lp:mir

files added:
include/client/mir_toolkit/extensions

include/client/mir_toolkit/extensions/set_gbm_device.h

include/client/mir_toolkit/mir_extension_core.h

include/common/mir/posix_rw_mutex.h

include/test/mir_test_framework/stub_platform_extension.h

src/client/error_render_surface.cpp

src/client/error_render_surface.h

src/client/mir_extension_core.cpp

src/include/client/mir_toolkit/extensions

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

src/server/frontend/protobuf_input_converter.cpp

src/server/frontend/protobuf_input_converter.h

src/server/frontend/session_mediator_observer_multiplexer.cpp

src/server/frontend/session_mediator_observer_multiplexer.h

src/server/graphics/display_configuration_observer_multiplexer.cpp

src/server/graphics/display_configuration_observer_multiplexer.h

src/server/input/seat_observer_multiplexer.cpp

src/server/input/seat_observer_multiplexer.h

src/server/report/reports.cpp

src/server/report/reports.h

tests/acceptance-tests/test_client_extensions.cpp

files removed:
include/common/mir/posix_rw_mutex.h

src/include/server/mir/frontend/unsupported_feature_exception.h

files renamed:
include/server/mir/frontend/session_mediator_report.h => include/server/mir/frontend/session_mediator_observer.h

include/server/mir/graphics/display_configuration_report.h => include/server/mir/graphics/display_configuration_observer.h

include/server/mir/input/seat_report.h => include/server/mir/input/seat_observer.h

src/client/client_buffer_stream.h => src/include/client/mir/client_buffer_stream.h

src/client/mir_buffer.h => src/include/client/mir/mir_buffer.h

files modified:
CMakeLists.txt

cross-compile-chroot.sh

debian/libmirclient-dev.install

debian/rules

examples/render_surfaces.cpp

examples/server_example_window_management_info.cpp

examples/server_example_window_management_info.h

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/mir_input_device.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/server.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/mock_seat_report.h

playground/diamond.c

playground/diamond.h

playground/egldiamond_render_surface.c

playground/mir_egl_platform_shim.c

playground/mir_egl_platform_shim.h

playground/render_surface.cpp

playground/server_configuration.cpp

src/client/CMakeLists.txt

src/client/buffer.h

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/error_buffer.h

src/client/error_stream.cpp

src/client/error_stream.h

src/client/input/CMakeLists.txt

src/client/input/input_devices.cpp

src/client/mir_buffer_stream_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_debug_api.cpp

src/client/mir_input_device_api.cpp

src/client/mir_presentation_chain.h

src/client/mir_render_surface.h

src/client/mir_render_surface_api.cpp

src/client/mir_screencast.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/mirclient.pc.in

src/client/render_surface.cpp

src/client/render_surface.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/screencast_stream.h

src/client/symbols.map

src/common/symbols.map

src/include/client/mir/client_platform.h

src/include/client/mir/input/input_devices.h

src/include/client/mir_toolkit/client_types_nbs.h

src/include/client/mir_toolkit/mir_render_surface.h

src/include/platform/mir/graphics/nested_context.h

src/include/server/mir/default_server_configuration.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/android_client_platform.h

src/platforms/eglstream-kms/client/client_platform.cpp

src/platforms/eglstream-kms/client/client_platform.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/client/client_platform.h

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/guest_platform.cpp

src/protobuf/mir_protobuf.proto

src/protobuf/symbols.map

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/event_sender.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/host_chain.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/input/CMakeLists.txt

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/report/CMakeLists.txt

src/server/report/default_server_configuration.cpp

src/server/report/logging/display_configuration_report.cpp

src/server/report/logging/display_configuration_report.h

src/server/report/logging/logging_report_factory.cpp

src/server/report/logging/seat_report.cpp

src/server/report/logging/seat_report.h

src/server/report/logging/session_mediator_report.h

src/server/report/logging_report_factory.h

src/server/report/lttng/lttng_report_factory.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng_report_factory.h

src/server/report/null/null_report_factory.cpp

src/server/report/null/seat_report.cpp

src/server/report/null/seat_report.h

src/server/report/null/session_mediator_report.h

src/server/report/null_report_factory.h

src/server/report/report_factory.h

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/scene/unsupported_coordinate_translator.cpp

src/server/server.cpp

src/server/symbols.map

src/utils/out.c

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/staging/test_render_surface.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

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

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

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

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

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

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

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

tests/include/mir_test_framework/fake_input_server_configuration.h

tests/include/mir_test_framework/stub_client_platform_factory.h

tests/include/mir_test_framework/testing_server_configuration.h

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/input/test_single_seat_setup.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_server_configuration.cpp

tests/mir_test_framework/stub_client_platform_factory.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_connection_resource_map.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_nested_input_platform.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

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

tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

cross-compile-chroot.sh

debian/libmirclient-dev.install

examples/render_surfaces.cpp

examples/server_example_window_management_info.cpp

examples/server_example_window_management_info.h

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/extensions/

include/client/mir_toolkit/extensions/set_gbm_device.h

include/client/mir_toolkit/mir_extension_core.h

include/client/mir_toolkit/mir_input_device.h

include/common/mir/posix_rw_mutex.h

include/common/mir/posix_rw_mutex.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/frontend/session_mediator_observer.h

include/server/mir/graphics/display_configuration_observer.h

include/server/mir/input/seat_observer.h

include/server/mir/server.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/mock_seat_report.h

include/test/mir_test_framework/stub_platform_extension.h

playground/diamond.c

playground/diamond.h

playground/egldiamond_render_surface.c

playground/mir_egl_platform_shim.c

playground/mir_egl_platform_shim.h

playground/render_surface.cpp

playground/server_configuration.cpp

src/client/CMakeLists.txt

src/client/buffer.h

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/error_buffer.h

src/client/error_render_surface.cpp

src/client/error_render_surface.h

src/client/error_stream.cpp

src/client/error_stream.h

src/client/input/CMakeLists.txt

src/client/input/input_devices.cpp

src/client/mir_buffer_stream_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_debug_api.cpp

src/client/mir_extension_core.cpp

src/client/mir_input_device_api.cpp

src/client/mir_presentation_chain.h

src/client/mir_render_surface.h

src/client/mir_render_surface_api.cpp

src/client/mir_screencast.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/mirclient.pc.in

src/client/render_surface.cpp

src/client/render_surface.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/screencast_stream.h

src/client/symbols.map

src/common/symbols.map

src/include/client/mir/client_buffer_stream.h

src/include/client/mir/client_platform.h

src/include/client/mir/input/input_devices.h

src/include/client/mir_toolkit/client_types_nbs.h

src/include/client/mir_toolkit/extensions/

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

src/include/client/mir_toolkit/mir_render_surface.h

src/include/platform/mir/graphics/nested_context.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/frontend/unsupported_feature_exception.h

src/platforms/android/client/android_client_platform.cpp

src/platforms/android/client/android_client_platform.h

src/platforms/eglstream-kms/client/client_platform.cpp

src/platforms/eglstream-kms/client/client_platform.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/client/client_platform.h

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/guest_platform.cpp

src/protobuf/mir_protobuf.proto

src/protobuf/symbols.map

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/default_ipc_factory.h

src/server/frontend/event_sender.cpp

src/server/frontend/protobuf_input_converter.cpp

src/server/frontend/protobuf_input_converter.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/session_mediator_observer_multiplexer.cpp

src/server/frontend/session_mediator_observer_multiplexer.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/display_configuration_observer_multiplexer.cpp

src/server/graphics/display_configuration_observer_multiplexer.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/host_chain.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/input/CMakeLists.txt

src/server/input/basic_seat.cpp

src/server/input/basic_seat.h

src/server/input/default_configuration.cpp

src/server/input/seat_input_device_tracker.cpp

src/server/input/seat_input_device_tracker.h

src/server/input/seat_observer_multiplexer.cpp

src/server/input/seat_observer_multiplexer.h

src/server/report/CMakeLists.txt

src/server/report/default_server_configuration.cpp

src/server/report/logging/display_configuration_report.cpp

src/server/report/logging/display_configuration_report.h

src/server/report/logging/logging_report_factory.cpp

src/server/report/logging/seat_report.cpp

src/server/report/logging/seat_report.h

src/server/report/logging/session_mediator_report.h

src/server/report/logging_report_factory.h

src/server/report/lttng/lttng_report_factory.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/lttng_report_factory.h

src/server/report/null/null_report_factory.cpp

src/server/report/null/seat_report.cpp

src/server/report/null/seat_report.h

src/server/report/null/session_mediator_report.h

src/server/report/null_report_factory.h

src/server/report/report_factory.h

src/server/report/reports.cpp

src/server/report/reports.h

src/server/scene/default_configuration.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/scene/unsupported_coordinate_translator.cpp

src/server/server.cpp

src/server/symbols.map

src/utils/out.c

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/staging/test_render_surface.cpp

tests/acceptance-tests/test_client_extensions.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_confined_pointer.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

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

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

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

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

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

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

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

tests/include/mir_test_framework/fake_input_server_configuration.h

tests/include/mir_test_framework/stub_client_platform_factory.h

tests/include/mir_test_framework/testing_server_configuration.h

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/input/test_single_seat_setup.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_server_configuration.cpp

tests/mir_test_framework/stub_client_platform_factory.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_connection_resource_map.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_nested_input_platform.cpp

tests/unit-tests/input/test_seat_input_device_tracker.cpp

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

tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Older »