← Back to branch summary

~andreas-pokorny/mir/activate-pointer-acceleration

~andreas-pokorny/mir/activate-pointer-acceleration

« back to all changes in this revision

Viewing changes to src/client/mir_connection.cpp

Committer: Christopher James Halse Rogers
Date: 2015-02-12 05:55:17 UTC
mfrom: (2314 development-branch)
mto: This revision was merged to the branch mainline in revision 2326.
Revision ID: christopher.halse.rogers@canonical.com-20150212055517-4ebh62tbmq4co2m8

Merge trunk

files added:
include/client/mir_toolkit/mir_buffer_stream.h

src/client/mir_buffer_stream_api.cpp

files removed:
src/platform/shared_library_loader.cpp

files renamed:
src/client/uncaught.h => src/include/common/mir/uncaught.h

files modified:
benchmarks/frame-uniformity/touch_measuring_client.cpp

doc/dso_versioning_guide.md

examples/basic.c

examples/eglapp.c

examples/fingerpaint.c

examples/flicker.c

examples/multiwin.c

examples/progressbar.c

examples/scroll.cpp

examples/server_example_window_management.cpp

examples/server_example_window_management.h

include/client/mir_toolkit/mir_client_library.h

include/client/mir_toolkit/mir_screencast.h

include/client/mir_toolkit/mir_surface.h

include/common/mir_toolkit/client_types.h

src/client/CMakeLists.txt

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/client_buffer_stream.h

src/client/default_client_buffer_stream_factory.cpp

src/client/default_client_buffer_stream_factory.h

src/client/default_connection_configuration.cpp

src/client/mir_connection.cpp

src/client/mir_connection_api.cpp

src/client/mir_cursor_api.cpp

src/client/mir_debug_api.cpp

src/client/mir_prompt_session_api.cpp

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/symbols-debug.map

src/client/symbols.map

src/common/graphics/android/mir_native_window.cpp

src/include/server/mir/glib_main_loop_sources.h

src/platform/symbols.map

src/platforms/mesa/client/native_surface.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/glib_main_loop_sources.cpp

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/nested_display.cpp

src/server/scene/surface_stack.cpp

src/utils/screencast.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/include/mir_test_doubles/mock_client_buffer_stream.h

tests/include/mir_test_doubles/mock_egl.h

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

tests/integration-tests/test_client_screencast.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/mir_test_doubles/mock_egl.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

tests/unit-tests/graphics/nested/test_nested_display.cpp

tests/unit-tests/graphics/offscreen/test_offscreen_display.cpp

tests/unit-tests/scene/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

src/client/mir_connection.cpp

472

472

std::shared_ptr<mir::client::ClientBufferStreamFactory> MirConnection::get_client_buffer_stream_factory()

473

473

{

474

474

if (!buffer_stream_factory)

475

buffer_stream_factory = std::make_shared<mcl::DefaultClientBufferStreamFactory>(platform->create_buffer_factory(),

476

platform, the_logger());

475

buffer_stream_factory = std::make_shared<mcl::DefaultClientBufferStreamFactory>(platform, the_logger());

477

476

return buffer_stream_factory;

478

477

}

479

478

Older »