← Back to branch summary

~mir-team/mir/dev-branch-staged

~mir-team/mir/dev-branch-staged

Viewing all changes in revision 1448.

Committer: Kevin Gunn
Date: 2014-04-04 18:53:56 UTC
mfrom: (1441.8.86 development-branch)
Revision ID: kevin.gunn@canonical.com-20140404185356-v1nxxq8ccugibe0t

merged dev-branch latest r1536

files added:
include/platform/mir/graphics/gl_config.h

include/server/mir/scene/surface_event_source.h

include/server/mir/scene/surface_observer.h

include/test/mir_test_doubles/mock_gl_config.h

include/test/mir_test_doubles/stub_gl_config.h

src/server/scene/legacy_surface_change_notification.cpp

src/server/scene/legacy_surface_change_notification.h

src/server/scene/surface_event_source.cpp

src/server/scene/surface_observer.cpp

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

files removed:
include/server/mir/shell/surface.h

include/server/mir/shell/surface_factory.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/stub_surface_builder.h

include/test/mir_test_doubles/stub_surface_ranker.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/rendering_operator.h

src/server/scene/surface_impl.cpp

src/server/scene/surface_impl.h

src/server/scene/surface_ranker.h

src/server/scene/surface_source.cpp

src/server/scene/surface_source.h

src/server/shell/organising_surface_factory.cpp

src/server/shell/organising_surface_factory.h

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

files renamed:
include/server/mir/shell/surface_configurator.h => include/server/mir/scene/surface_configurator.h

src/server/scene/surface_builder.h => include/server/mir/scene/surface_coordinator.h

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

include/test/mir_test_doubles/mock_surface_ranker.h => include/test/mir_test_doubles/mock_surface_coordinator.h

files modified:
CMakeLists.txt

examples/demo-shell/demo_renderer.cpp

examples/demo-shell/demo_renderer.h

examples/demo-shell/window_manager.cpp

examples/render_overlays.cpp

examples/render_surfaces.cpp

include/platform/mir/graphics/platform.h

include/platform/mir/graphics/renderable.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/compositor/scene.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session.h

include/server/mir/frontend/surface.h

include/server/mir/scene/surface.h

include/server/mir/shell/null_session_listener.h

include/server/mir/shell/session.h

include/server/mir/shell/session_listener.h

include/test/mir_test_doubles/fake_renderable.h

include/test/mir_test_doubles/mock_egl.h

include/test/mir_test_doubles/mock_framebuffer_bundle.h

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/mock_scene.h

include/test/mir_test_doubles/mock_session_listener.h

include/test/mir_test_doubles/mock_shell_session.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_configurator.h

include/test/mir_test_doubles/null_platform.h

include/test/mir_test_doubles/null_surface_configurator.h

include/test/mir_test_doubles/stub_renderable.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_shell_session.h

src/platform/graphics/android/CMakeLists.txt

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/android_platform.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/framebuffer_bundle.h

src/platform/graphics/android/framebuffers.cpp

src/platform/graphics/android/framebuffers.h

src/platform/graphics/android/gl_context.cpp

src/platform/graphics/android/gl_context.h

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display.h

src/platform/graphics/mesa/display_buffer.cpp

src/platform/graphics/mesa/display_buffer.h

src/platform/graphics/mesa/display_helpers.cpp

src/platform/graphics/mesa/display_helpers.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/server/compositor/CMakeLists.txt

src/server/compositor/bypass.cpp

src/server/compositor/bypass.h

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/occlusion.cpp

src/server/compositor/occlusion.h

src/server/default_server_configuration.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/mirserver.pc.in

src/server/scene/CMakeLists.txt

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/scene/surface_stack.cpp

src/server/scene/surface_stack.h

src/server/scene/surface_stack_model.h

src/server/shell/CMakeLists.txt

src/server/shell/default_configuration.cpp

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_focus_mechanism.h

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

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

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

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

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_bypass.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_occlusion.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

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

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

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

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

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

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

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

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

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

tests/unit-tests/graphics/nested/CMakeLists.txt

tests/unit-tests/graphics/test_display.cpp

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

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_default_focus_mechanism.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/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

examples/demo-shell/demo_renderer.cpp

examples/demo-shell/demo_renderer.h

examples/demo-shell/window_manager.cpp

examples/render_overlays.cpp

examples/render_surfaces.cpp

include/platform/mir/graphics/gl_config.h

include/platform/mir/graphics/platform.h

include/platform/mir/graphics/renderable.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/compositor/scene.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/session.h

include/server/mir/frontend/surface.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_configurator.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/scene/surface_event_source.h

include/server/mir/scene/surface_factory.h

include/server/mir/scene/surface_observer.h

include/server/mir/shell/null_session_listener.h

include/server/mir/shell/session.h

include/server/mir/shell/session_listener.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_factory.h

include/test/mir_test_doubles/fake_renderable.h

include/test/mir_test_doubles/mock_egl.h

include/test/mir_test_doubles/mock_framebuffer_bundle.h

include/test/mir_test_doubles/mock_gl_config.h

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/mock_scene.h

include/test/mir_test_doubles/mock_session_listener.h

include/test/mir_test_doubles/mock_shell_session.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_configurator.h

include/test/mir_test_doubles/mock_surface_coordinator.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/null_platform.h

include/test/mir_test_doubles/null_surface_configurator.h

include/test/mir_test_doubles/stub_gl_config.h

include/test/mir_test_doubles/stub_renderable.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_shell_session.h

include/test/mir_test_doubles/stub_surface_builder.h

include/test/mir_test_doubles/stub_surface_ranker.h

src/platform/graphics/android/CMakeLists.txt

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/android_platform.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/framebuffer_bundle.h

src/platform/graphics/android/framebuffers.cpp

src/platform/graphics/android/framebuffers.h

src/platform/graphics/android/gl_context.cpp

src/platform/graphics/android/gl_context.h

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display.h

src/platform/graphics/mesa/display_buffer.cpp

src/platform/graphics/mesa/display_buffer.h

src/platform/graphics/mesa/display_helpers.cpp

src/platform/graphics/mesa/display_helpers.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/server/compositor/CMakeLists.txt

src/server/compositor/bypass.cpp

src/server/compositor/bypass.h

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/occlusion.cpp

src/server/compositor/occlusion.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/rendering_operator.h

src/server/default_server_configuration.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display.h

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

src/server/mirserver.pc.in

src/server/scene/CMakeLists.txt

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

src/server/scene/legacy_surface_change_notification.h

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/scene/surface_event_source.cpp

src/server/scene/surface_impl.cpp

src/server/scene/surface_impl.h

src/server/scene/surface_observer.cpp

src/server/scene/surface_ranker.h

src/server/scene/surface_source.cpp

src/server/scene/surface_source.h

src/server/scene/surface_stack.cpp

src/server/scene/surface_stack.h

src/server/scene/surface_stack_model.h

src/server/shell/CMakeLists.txt

src/server/shell/default_configuration.cpp

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_focus_mechanism.h

src/server/shell/organising_surface_factory.cpp

src/server/shell/organising_surface_factory.h

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

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

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

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

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_bypass.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_occlusion.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

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

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

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

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

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

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

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

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

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

tests/unit-tests/graphics/nested/CMakeLists.txt

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

tests/unit-tests/graphics/test_display.cpp

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

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_default_focus_mechanism.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/CMakeLists.txt

tests/unit-tests/shell/test_organising_surface_factory.cpp

Older »