← Back to branch summary

~alan-griffiths/junk/composition-bypass

~alan-griffiths/junk/composition-bypass

Viewing all changes in revision 713.

Committer: Alan Griffiths
Date: 2013-05-31 11:14:55 UTC
mfrom: (693.3.19 trunk)
Revision ID: alan@octopull.co.uk-20130531111455-5ka3q9h9hhnffx70

merge lp:mir

include/client/mir_toolkit/mir_client_library_drm.h

include/server/mir/graphics/drm_authenticator.h

include/server/mir/input/input_report.h

include/server/mir/input/input_targets.h

include/server/mir/input/null_input_configuration.h

include/server/mir/input/null_input_report.h

include/server/mir/lttng/input_report.h

include/server/mir/shell/input_targeter.h

include/server/mir/surfaces/input_registrar.h

include/test/mir_test_doubles/mock_input_targeter.h

include/test/mir_test_doubles/stub_input_targeter.h

src/client/rpc

src/client/rpc/CMakeLists.txt

src/server/frontend/session_mediator_android.cpp

src/server/frontend/session_mediator_gbm.cpp

src/server/input/android/android_input_registrar.cpp

src/server/input/android/android_input_registrar.h

src/server/input/android/android_input_target_enumerator.cpp

src/server/input/android/android_input_target_enumerator.h

src/server/input/android/android_window_handle_repository.h

src/server/input/null_input_configuration.cpp

src/server/input/null_input_report.cpp

src/server/lttng/input_report.cpp

src/server/lttng/input_report_tp.c

src/server/lttng/input_report_tp.h

tests/integration-tests/test_drm_auth_magic.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

tests/unit-tests/input/android/test_android_input_target_enumerator.cpp

tests/unit-tests/input/android/test_android_input_targeter.cpp

files removed:
3rd_party/android-input/android/frameworks/base/services/input/InputManager.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputManager.h

3rd_party/android-input/tools

3rd_party/android-input/tools/CMakeLists.txt

3rd_party/android-input/tools/cooked_event_printer.cpp

3rd_party/android-input/tools/dispatcher_check.cpp

3rd_party/android-input/tools/raw_event_printer.cpp

include/server/mir/input/null_input_manager.h

include/server/mir/input/null_input_target_listener.h

include/server/mir/input/session_target.h

include/server/mir/shell/input_target_listener.h

include/test/mir_test_doubles/stub_session_target.h

tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp

files renamed:
include/server/mir/input/android/android_input_configuration.h => include/server/mir/input/input_configuration.h

include/test/mir_test_doubles/mock_input_target_listener.h => include/test/mir_test_doubles/mock_input_registrar.h

include/test/mir_test_doubles/stub_input_target_listener.h => include/test/mir_test_doubles/stub_input_registrar.h

src/client/make_rpc_channel.h => src/client/rpc/make_rpc_channel.h

src/client/make_socket_rpc_channel.cpp => src/client/rpc/make_socket_rpc_channel.cpp

src/client/mir_basic_rpc_channel.cpp => src/client/rpc/mir_basic_rpc_channel.cpp

src/client/mir_basic_rpc_channel.h => src/client/rpc/mir_basic_rpc_channel.h

src/client/mir_socket_rpc_channel.cpp => src/client/rpc/mir_socket_rpc_channel.cpp

src/client/mir_socket_rpc_channel.h => src/client/rpc/mir_socket_rpc_channel.h

src/client/null_rpc_report.cpp => src/client/rpc/null_rpc_report.cpp

src/client/null_rpc_report.h => src/client/rpc/null_rpc_report.h

src/client/rpc_report.h => src/client/rpc/rpc_report.h

src/server/input/android/android_dispatcher_controller.cpp => src/server/input/android/android_input_targeter.cpp

src/server/input/android/android_dispatcher_controller.h => src/server/input/android/android_input_targeter.h

tests/unit-tests/input/android/test_android_dispatcher_controller.cpp => tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/logging/test_input_report.cpp => tests/unit-tests/logging/test_legacy_input_report.cpp

files modified:
3rd_party/android-input/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp

3rd_party/android-input/android/frameworks/base/services/input/EventHub.h

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h

examples/render_surfaces.cpp

include/server/mir/compositor/buffer_swapper.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/input/surface_target.h

include/server/mir/logging/input_report.h

include/server/mir/logging/session_mediator_report.h

include/server/mir/shell/application_session.h

include/server/mir/shell/session.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/single_visibility_focus_mechanism.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_source.h

include/server/mir/surfaces/surface.h

include/server/mir/surfaces/surface_stack.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test/stub_server_tool.h

include/test/mir_test/test_protobuf_client.h

include/test/mir_test_doubles/mock_input_configuration.h

include/test/mir_test_doubles/mock_input_dispatcher.h

include/test/mir_test_doubles/mock_rpc_report.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_swapper.h

include/test/mir_test_doubles/stub_surface_builder.h

include/test/mir_test_doubles/stub_surface_target.h

include/test/mir_test_framework/testing_server_configuration.h

src/client/CMakeLists.txt

src/client/logging/rpc_report.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/null_session_mediator_report.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/gbm/gbm_display_helpers.cpp

src/server/graphics/gbm/gbm_display_helpers.h

src/server/graphics/gbm/gbm_platform.cpp

src/server/graphics/gbm/gbm_platform.h

src/server/input/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/android/android_input_application_handle.cpp

src/server/input/android/android_input_application_handle.h

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_manager.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/android/default_android_input_configuration.h

src/server/logging/input_report.cpp

src/server/logging/session_mediator_report.cpp

src/server/lttng/CMakeLists.txt

src/server/shell/application_session.cpp

src/server/shell/session_manager.cpp

src/server/shell/single_visibility_focus_mechanism.cpp

src/server/shell/surface.cpp

src/server/shell/surface_source.cpp

src/server/surfaces/surface.cpp

src/server/surfaces/surface_stack.cpp

src/shared/input/android/android_input_receiver.cpp

src/shared/input/android/android_input_receiver.h

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/behavior-tests/session_management_context.cpp

tests/client-language/c89.c

tests/death-tests/test_application_manager_death.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/input/android/CMakeLists.txt

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_communicator.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/gbm/test_gbm_platform.cpp

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/android/test_android_input_application_handle.cpp

tests/unit-tests/input/android/test_android_input_manager.cpp

tests/unit-tests/input/android/test_android_input_window_handle.cpp

tests/unit-tests/logging/CMakeLists.txt

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp

3rd_party/android-input/android/frameworks/base/services/input/EventHub.h

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h

3rd_party/android-input/android/frameworks/base/services/input/InputEnumerator.h

3rd_party/android-input/android/frameworks/base/services/input/InputManager.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputManager.h

3rd_party/android-input/tools/

3rd_party/android-input/tools/CMakeLists.txt

3rd_party/android-input/tools/cooked_event_printer.cpp

3rd_party/android-input/tools/dispatcher_check.cpp

3rd_party/android-input/tools/raw_event_printer.cpp

examples/render_surfaces.cpp

include/client/mir_toolkit/mir_client_library_drm.h

include/server/mir/compositor/buffer_swapper.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/graphics/drm_authenticator.h

include/server/mir/input/input_configuration.h

include/server/mir/input/input_report.h

include/server/mir/input/input_targets.h

include/server/mir/input/null_input_configuration.h

include/server/mir/input/null_input_manager.h

include/server/mir/input/null_input_report.h

include/server/mir/input/null_input_target_listener.h

include/server/mir/input/session_target.h

include/server/mir/input/surface_target.h

include/server/mir/logging/input_report.h

include/server/mir/logging/session_mediator_report.h

include/server/mir/lttng/input_report.h

include/server/mir/shell/application_session.h

include/server/mir/shell/input_target_listener.h

include/server/mir/shell/input_targeter.h

include/server/mir/shell/session.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/single_visibility_focus_mechanism.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_source.h

include/server/mir/surfaces/input_registrar.h

include/server/mir/surfaces/surface.h

include/server/mir/surfaces/surface_stack.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test/stub_server_tool.h

include/test/mir_test/test_protobuf_client.h

include/test/mir_test_doubles/mock_input_configuration.h

include/test/mir_test_doubles/mock_input_dispatcher.h

include/test/mir_test_doubles/mock_input_registrar.h

include/test/mir_test_doubles/mock_input_targeter.h

include/test/mir_test_doubles/mock_rpc_report.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_swapper.h

include/test/mir_test_doubles/stub_input_registrar.h

include/test/mir_test_doubles/stub_input_targeter.h

include/test/mir_test_doubles/stub_session_target.h

include/test/mir_test_doubles/stub_surface_builder.h

include/test/mir_test_doubles/stub_surface_target.h

include/test/mir_test_framework/testing_server_configuration.h

src/client/CMakeLists.txt

src/client/logging/rpc_report.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/rpc/

src/client/rpc/CMakeLists.txt

src/client/rpc/make_rpc_channel.h

src/client/rpc/make_socket_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/client/rpc/null_rpc_report.cpp

src/client/rpc/null_rpc_report.h

src/client/rpc/rpc_report.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/null_session_mediator_report.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator_android.cpp

src/server/frontend/session_mediator_gbm.cpp

src/server/graphics/gbm/gbm_display_helpers.cpp

src/server/graphics/gbm/gbm_display_helpers.h

src/server/graphics/gbm/gbm_platform.cpp

src/server/graphics/gbm/gbm_platform.h

src/server/input/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/android/android_input_application_handle.cpp

src/server/input/android/android_input_application_handle.h

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_manager.h

src/server/input/android/android_input_registrar.cpp

src/server/input/android/android_input_registrar.h

src/server/input/android/android_input_target_enumerator.cpp

src/server/input/android/android_input_target_enumerator.h

src/server/input/android/android_input_targeter.cpp

src/server/input/android/android_input_targeter.h

src/server/input/android/android_window_handle_repository.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/android/default_android_input_configuration.h

src/server/input/null_input_configuration.cpp

src/server/input/null_input_report.cpp

src/server/logging/input_report.cpp

src/server/logging/session_mediator_report.cpp

src/server/lttng/CMakeLists.txt

src/server/lttng/input_report.cpp

src/server/lttng/input_report_tp.c

src/server/lttng/input_report_tp.h

src/server/shell/application_session.cpp

src/server/shell/session_manager.cpp

src/server/shell/single_visibility_focus_mechanism.cpp

src/server/shell/surface.cpp

src/server/shell/surface_source.cpp

src/server/surfaces/surface.cpp

src/server/surfaces/surface_stack.cpp

src/shared/input/android/android_input_receiver.cpp

src/shared/input/android/android_input_receiver.h

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/behavior-tests/session_management_context.cpp

tests/client-language/c89.c

tests/death-tests/test_application_manager_death.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/input/android/CMakeLists.txt

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_communicator.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

tests/unit-tests/graphics/gbm/test_gbm_platform.cpp

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/android/test_android_input_application_handle.cpp

tests/unit-tests/input/android/test_android_input_manager.cpp

tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/input/android/test_android_input_target_enumerator.cpp

tests/unit-tests/input/android/test_android_input_targeter.cpp

tests/unit-tests/input/android/test_android_input_window_handle.cpp

tests/unit-tests/logging/CMakeLists.txt

tests/unit-tests/logging/test_legacy_input_report.cpp

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

Older »