← Back to branch summary

~brandontschaefer/mir/input-consumer

~brandontschaefer/mir/input-consumer

« back to all changes in this revision

Viewing changes to src/server/scene/session_manager.cpp

Committer: Brandon Schaefer
Date: 2016-04-06 19:16:37 UTC
mfrom: (3400.1.40 input-channel-new)
Revision ID: brandon.schaefer@canonical.com-20160406191637-9lri45c0f9z26umv

* Merge trunk + input_channel_new

files added:
tests/test-clients

tests/test-clients/CMakeLists.txt

tests/test-clients/impolite-shutdown

tests/test-clients/impolite-shutdown/CMakeLists.txt

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

files renamed:
src/server/input/android/android_input_channel.cpp => src/server/input/channel.cpp

src/server/input/android/android_input_channel.h => src/server/input/channel.h

src/server/input/android/input_channel_factory.cpp => src/server/input/channel_factory.cpp

src/server/input/android/input_channel_factory.h => src/server/input/channel_factory.h

tests/mir-stress/ => tests/test-clients/mir-stress/

tests/unit-tests/input/android/test_android_input_channel_factory.cpp => tests/unit-tests/input/test_input_channel_factory.cpp

files modified:
3rd_party/android-input/android/frameworks/base/include/androidfw/InputTransport.h

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

debian/changelog

debian/mir-test-tools.install

doc/dso_versioning_guide.md

examples/CMakeLists.txt

examples/scroll.cpp

examples/server_example_test_client.cpp

examples/target.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/mir_screencast.h

include/common/mir/optional_value.h

include/common/mir_toolkit/common.h

include/platform/mir/graphics/display_buffer.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/scene/session.h

include/server/mir/time/alarm_factory.h

include/test/mir/test/doubles/null_display_buffer.h

include/test/mir/test/doubles/stub_session.h

playground/demo-shell/demo_compositor.cpp

src/client/buffer.cpp

src/client/buffer.h

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/rpc/mir_display_server.cpp

src/client/rpc/mir_display_server.h

src/client/symbols.map

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

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

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

src/include/server/mir/compositor/renderer.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/platform/symbols.map

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/display_buffer.h

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

src/platforms/mesa/server/kms/display_buffer.h

src/platforms/mesa/server/x11/graphics/display_buffer.cpp

src/platforms/mesa/server/x11/graphics/display_buffer.h

src/protobuf/symbols.map

src/renderers/gl/renderer.cpp

src/renderers/gl/renderer.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/buffer_queue.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/screencast_display_buffer.h

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/graphics/nested/display_buffer.h

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

src/server/input/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/default_configuration.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

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/session_manager.cpp

src/server/server.cpp

src/server/symbols.map

tests/CMakeLists.txt

tests/acceptance-tests/test_client_logging.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_session_mediator_report.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

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

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

tests/include/mir/test/doubles/mock_display_buffer.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_renderer.h

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

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

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

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

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

tests/include/mir/test/stub_server_tool.h

tests/include/mir/test/test_protobuf_client.h

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_client_screencast.cpp

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/mir_test_framework/stub_session.cpp

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

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/client/test_mir_buffer.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.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/graphics/android/test_display_group.cpp

tests/unit-tests/input/CMakeLists.txt

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

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

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

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

tests/unit-tests/input/test_key_repeat_dispatcher.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

src/server/scene/session_manager.cpp

128

128

{

129

129

auto scene_session = std::dynamic_pointer_cast<Session>(session);

130

130

131

scene_session->force_requests_to_complete();

131

scene_session->drop_outstanding_requests();

132

132

133

133

anr_detector->unregister_session(session.get());

134

134

Older »