~hikiko/mir/mir.unity8-desktop-session

« back to all changes in this revision

Viewing changes to src/server/graphics/nested/nested_display.cpp

Committer: Stephen M. Webb
Date: 2014-02-25 20:15:07 UTC
mfrom: (61.1.1 trusty-proposed)
Revision ID: stephen.webb@canonical.com-20140225201507-cicfzmdznvr059b2

merged from Ubuntu

files added:
debian/libmirclient7.install

debian/libmirserver15.install

include/server/mir/frontend/screencast.h

include/test/mir_test_doubles/mock_screencast.h

include/test/mir_test_doubles/null_screencast.h

src/utils/screencast.cpp

tests/integration-tests/client/test_screencast.cpp

files removed:
debian/libmirclient6.install

debian/libmirserver14.install

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/mir-utils.install

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/render_surfaces.cpp

include/platform/mir/graphics/display.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/message_processor.h

include/server/mir/frontend/shell.h

include/server/mir/frontend/surface.h

include/server/mir/frontend/template_protobuf_message_processor.h

include/server/mir/shell/session.h

include/shared/mir/int_wrapper.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_display.h

include/test/mir_test_doubles/mock_fb_hal_device.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_doubles/mock_hwc_composer_device_1.h

include/test/mir_test_doubles/mock_shell.h

include/test/mir_test_doubles/mock_shell_session.h

include/test/mir_test_doubles/null_display.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_shell.h

include/test/mir_test_doubles/stub_shell_session.h

src/client/CMakeLists.txt

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/rpc/mir_socket_rpc_channel.cpp

src/platform/graphics/android/android_alloc_adaptor.cpp

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.h

src/platform/graphics/android/android_platform.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_layers.cpp

src/platform/graphics/android/internal_client_window.cpp

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/android/resource_factory.cpp

src/platform/graphics/android/server_render_window.cpp

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display.h

src/server/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/default_configuration.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/display_server.cpp

src/server/frontend/default_configuration.cpp

src/server/frontend/protobuf_ipc_factory.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/frontend/surface.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display.h

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_impl.cpp

src/server/scene/surface_impl.h

src/utils/CMakeLists.txt

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_protobuf.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/draw/android_graphics.cpp

tests/integration-tests/client/CMakeLists.txt

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

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

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

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

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/compositor/test_temporary_buffers.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_mesa.cpp

tests/unit-tests/frontend/test_socket_session.cpp

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp

tests/unit-tests/graphics/android/test_hwc_common_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

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

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shell/test_graphics_display_layout.cpp

Show diffs side-by-side

added added

removed removed

src/server/graphics/nested/nested_display.cpp

152

f(*i.second);

153

}

154

155

std::shared_ptr<mg::DisplayConfiguration> mgn::NestedDisplay::configuration()

155

std::unique_ptr<mg::DisplayConfiguration> mgn::NestedDisplay::configuration() const

156

{

157

return std::make_shared<NestedDisplayConfiguration>(mir_connection_create_display_config(*connection));

157

return std::unique_ptr<mg::DisplayConfiguration>(

158

new NestedDisplayConfiguration(

159

mir_connection_create_display_config(*connection)

160

)

161

);

158

162

}

159

163

160

164

void mgn::NestedDisplay::complete_display_initialization(MirPixelFormat format)

Older »