← Back to branch summary

~kdub/+junk/direct

~kdub/+junk/direct

Viewing all changes in revision 3423.

Committer: Kevin DuBois
Date: 2016-04-05 13:15:56 UTC
mfrom: (3359.35.30 development-branch)
Revision ID: kevin.dubois@canonical.com-20160405131556-asujsjoxqdkombmi

merge in mir

files added:
src/common/events/close_surface_event.cpp

src/common/events/event.cpp

src/common/events/input_configuration_event.cpp

src/common/events/input_event.cpp

src/common/events/keyboard_event.cpp

src/common/events/keymap_event.cpp

src/common/events/motion_event.cpp

src/common/events/orientation_event.cpp

src/common/events/prompt_session_event.cpp

src/common/events/resize_event.cpp

src/common/events/surface_event.cpp

src/common/events/surface_output_event.cpp

src/include/common/mir/events/close_surface_event.h

src/include/common/mir/events/event.h

src/include/common/mir/events/input_configuration_event.h

src/include/common/mir/events/input_event.h

src/include/common/mir/events/keyboard_event.h

src/include/common/mir/events/keymap_event.h

src/include/common/mir/events/motion_event.h

src/include/common/mir/events/orientation_event.h

src/include/common/mir/events/prompt_session_event.h

src/include/common/mir/events/resize_event.h

src/include/common/mir/events/surface_event.h

src/include/common/mir/events/surface_output_event.h

files removed:
src/common/events/event_private.cpp

files modified:
doc/dso_versioning_guide.md

include/server/mir/frontend/session_mediator_report.h

include/server/mir/time/alarm_factory.h

src/client/event.cpp

src/client/events/event_builders.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/common/events/CMakeLists.txt

src/common/symbols.map

src/include/common/mir/events/event_private.h

src/include/common/mir/protobuf/display_server.h

src/include/server/mir/compositor/frame_dropping_policy_factory.h

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

src/include/server/mir/glib_main_loop.h

src/include/server/mir/lockable_callback_wrapper.h

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_map.cpp

src/server/compositor/buffer_map.h

src/server/compositor/buffer_queue.cpp

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/compositor/timeout_frame_dropping_policy_factory.cpp

src/server/compositor/timeout_frame_dropping_policy_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/glib_main_loop.cpp

src/server/graphics/nested/display_buffer.cpp

src/server/input/android/input_sender.cpp

src/server/input/default_event_builder.cpp

src/server/input/key_repeat_dispatcher.cpp

src/server/input/surface_input_dispatcher.cpp

src/server/input/validator.cpp

src/server/lockable_callback_wrapper.cpp

src/server/report/logging/session_mediator_report.cpp

src/server/report/logging/session_mediator_report.h

src/server/report/lttng/session_mediator_report.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/null/session_mediator_report.cpp

src/server/report/null/session_mediator_report.h

tests/acceptance-tests/test_session_mediator_report.cpp

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

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

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

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

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

tests/include/mir/test/stub_server_tool.h

tests/include/mir/test/test_protobuf_client.h

tests/mir_test_doubles/fake_alarm_factory.cpp

tests/mir_test_doubles/mock_frame_dropping_policy_factory.cpp

tests/mir_test_doubles/mock_timer.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/test_event_distributor.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/compositor/test_timeout_frame_dropping_policy.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/input/test_key_repeat_dispatcher.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/test_glib_main_loop.cpp

tests/unit-tests/test_lockable_callback.cpp

Show diffs side-by-side

added added

removed removed

doc/dso_versioning_guide.md

include/server/mir/frontend/session_mediator_report.h

include/server/mir/time/alarm_factory.h

src/client/event.cpp

src/client/events/event_builders.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/common/events/CMakeLists.txt

src/common/events/close_surface_event.cpp

src/common/events/event.cpp

src/common/events/event_private.cpp

src/common/events/input_configuration_event.cpp

src/common/events/input_event.cpp

src/common/events/keyboard_event.cpp

src/common/events/keymap_event.cpp

src/common/events/motion_event.cpp

src/common/events/orientation_event.cpp

src/common/events/prompt_session_event.cpp

src/common/events/resize_event.cpp

src/common/events/surface_event.cpp

src/common/events/surface_output_event.cpp

src/common/symbols.map

src/include/common/mir/events/close_surface_event.h

src/include/common/mir/events/event.h

src/include/common/mir/events/event_private.h

src/include/common/mir/events/input_configuration_event.h

src/include/common/mir/events/input_event.h

src/include/common/mir/events/keyboard_event.h

src/include/common/mir/events/keymap_event.h

src/include/common/mir/events/motion_event.h

src/include/common/mir/events/orientation_event.h

src/include/common/mir/events/prompt_session_event.h

src/include/common/mir/events/resize_event.h

src/include/common/mir/events/surface_event.h

src/include/common/mir/events/surface_output_event.h

src/include/common/mir/protobuf/display_server.h

src/include/server/mir/compositor/frame_dropping_policy_factory.h

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

src/include/server/mir/glib_main_loop.h

src/include/server/mir/lockable_callback_wrapper.h

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_map.cpp

src/server/compositor/buffer_map.h

src/server/compositor/buffer_queue.cpp

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/compositor/timeout_frame_dropping_policy_factory.cpp

src/server/compositor/timeout_frame_dropping_policy_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/glib_main_loop.cpp

src/server/graphics/nested/display_buffer.cpp

src/server/input/android/input_sender.cpp

src/server/input/default_event_builder.cpp

src/server/input/key_repeat_dispatcher.cpp

src/server/input/surface_input_dispatcher.cpp

src/server/input/validator.cpp

src/server/lockable_callback_wrapper.cpp

src/server/report/logging/session_mediator_report.cpp

src/server/report/logging/session_mediator_report.h

src/server/report/lttng/session_mediator_report.cpp

src/server/report/lttng/session_mediator_report.h

src/server/report/null/session_mediator_report.cpp

src/server/report/null/session_mediator_report.h

tests/acceptance-tests/test_session_mediator_report.cpp

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

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

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

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

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

tests/include/mir/test/stub_server_tool.h

tests/include/mir/test/test_protobuf_client.h

tests/mir_test_doubles/fake_alarm_factory.cpp

tests/mir_test_doubles/mock_frame_dropping_policy_factory.cpp

tests/mir_test_doubles/mock_timer.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/test_event_distributor.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/compositor/test_timeout_frame_dropping_policy.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/input/test_key_repeat_dispatcher.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/test_glib_main_loop.cpp

tests/unit-tests/test_lockable_callback.cpp

Older »