~alan-griffiths/mir/workaround-lp1602199

Viewing changes to examples/server_example_canonical_window_manager.cpp

Committer: Tarmac
Author(s): Kevin DuBois
Date: 2016-05-03 09:49:54 UTC
mfrom: (3369.2.31 server-side-alloc)
Revision ID: tarmac-20160503094954-6l9jtr20mydxs3l7

server: Change point of frontend-facing buffer allocation from the mf::BufferStream to the msc::Session to prepare for NBS connection-allocated buffers.

We were previously allocating from the streams, but to accommodate mir_connection_allocate_buffer(), we will have to allocate via msc::Session.

This exposes mf::ClientBuffers(), as the streams need to reflect that buffers came from the same Session/connection. (cross-connection/cross-process mirclient-allocated-buffers are not supported). render_surfaces has an example of a 'floating' shell buffer stream that didn't originate from IPC.

Approved by mir-ci-bot, Cemil Azizoglu, Chris Halse Rogers.

files renamed:
src/include/server/mir/frontend/client_buffers.h => include/server/mir/frontend/client_buffers.h

files modified:
examples/render_surfaces.cpp

examples/server_example_canonical_window_manager.cpp

examples/server_example_window_management_info.cpp

examples/server_example_window_management_info.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/frontend/session.h

include/server/mir/scene/buffer_stream_factory.h

include/server/mir/scene/session.h

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

src/server/compositor/buffer_map.cpp

src/server/compositor/buffer_map.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/frontend/session_mediator.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

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

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

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

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

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

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_framework/stub_session.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_session_manager.cpp

Show diffs side-by-side

added added

removed removed

examples/server_example_canonical_window_manager.cpp

276

surface_map.emplace(titlebar, SurfaceInfo{session, titlebar, {}}).first->second;

277

titlebar_info.is_titlebar = true;

278

titlebar_info.parent = surface;

279

titlebar_info.init_titlebar(titlebar);

279

titlebar_info.init_titlebar(session, titlebar);

280

}

281

282

void me::CanonicalWindowManagerPolicyCopy::handle_new_surface(std::shared_ptr<ms::Session> const& session, std::shared_ptr<ms::Surface> const& surface)

Older »