← Back to branch summary

~vanvugt/mir/ddouble

~vanvugt/mir/ddouble

Viewing all changes in revision 2156.

Committer: Daniel van Vugt
Date: 2015-05-11 03:53:54 UTC
mfrom: (2094.3.466 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20150511035354-cr65i9hbqfn589uh

Merge latest trunk

files added:
src/include/server/mir/scene/surface_observers.h

tests/include/mir_test_doubles/stub_surface_factory.h

files renamed:
src/include/server/mir/scene/buffer_stream_factory.h => include/server/mir/scene/buffer_stream_factory.h

src/include/server/mir/scene/surface_factory.h => include/server/mir/scene/surface_factory.h

src/server/shell/basic_window_manager.h => src/include/server/mir/shell/basic_window_manager.h

src/server/shell/canonical_window_manager.h => src/include/server/mir/shell/canonical_window_manager.h

files modified:
examples/render_surfaces.cpp

examples/server_example_canonical_window_manager.cpp

include/server/mir/frontend/surface.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/server.h

playground/demo-shell/demo_shell.cpp

playground/server_configuration.cpp

playground/server_configuration.h

src/client/CMakeLists.txt

src/client/events/event_builders.cpp

src/common/logging/shared_library_prober_report.cpp

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

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/gl_renderer.cpp

src/server/display_server.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/default_configuration.cpp

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/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_allocator.cpp

src/server/scene/surface_allocator.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

src/server/server.cpp

src/server/shell/canonical_window_manager.cpp

src/server/shell/default_configuration.cpp

src/server/symbols.map

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/include/mir_test_doubles/mock_buffer_bundle.h

tests/include/mir_test_doubles/mock_buffer_stream.h

tests/include/mir_test_doubles/mock_frontend_surface.h

tests/include/mir_test_doubles/mock_surface_coordinator.h

tests/include/mir_test_doubles/stub_buffer_stream.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_default_window_manager.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/integration-tests/test_swapinterval.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_controller.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shell/test_default_window_manager.cpp

Show diffs side-by-side

added added

removed removed

examples/render_surfaces.cpp

examples/server_example_canonical_window_manager.cpp

include/server/mir/frontend/surface.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/scene/surface_factory.h

include/server/mir/server.h

playground/demo-shell/demo_shell.cpp

playground/server_configuration.cpp

playground/server_configuration.h

src/client/CMakeLists.txt

src/client/events/event_builders.cpp

src/common/logging/shared_library_prober_report.cpp

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

src/include/server/mir/scene/surface_observers.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/gl_renderer.cpp

src/server/display_server.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/default_configuration.cpp

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/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_allocator.cpp

src/server/scene/surface_allocator.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

src/server/server.cpp

src/server/shell/canonical_window_manager.cpp

src/server/shell/default_configuration.cpp

src/server/symbols.map

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/include/mir_test_doubles/mock_buffer_bundle.h

tests/include/mir_test_doubles/mock_buffer_stream.h

tests/include/mir_test_doubles/mock_frontend_surface.h

tests/include/mir_test_doubles/mock_surface_coordinator.h

tests/include/mir_test_doubles/stub_buffer_stream.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/include/mir_test_doubles/stub_surface_factory.h

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_default_window_manager.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/integration-tests/test_swapinterval.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_controller.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shell/test_default_window_manager.cpp

Older »