← Back to branch summary

~cemil-azizoglu/mir/fix-perf-report-surface-name-lp1415305

~cemil-azizoglu/mir/fix-perf-report-surface-name-lp1415305

Viewing all changes in revision 2207.4.5.

Committer: Daniel van Vugt
Date: 2015-01-14 06:39:13 UTC
mfrom: (2219 development-branch)
mto: This revision was merged to the branch mainline in revision 2232.
Revision ID: daniel.van.vugt@canonical.com-20150114063913-hp880xul6y5grfyr

Merge latest trunk and fix conflicts.

files added:
src/include/common/mir/require.h

files removed:
src/include/common/mir/require.h

src/include/server/mir/asio_main_loop.h

src/server/asio_main_loop.cpp

tests/unit-tests/test_asio_main_loop.cpp

files renamed:
debian/libmirplatform5.install => debian/libmirplatform6.install

debian/libmirplatform5driver-android.install => debian/libmirplatform6driver-android.install

debian/libmirplatform5driver-mesa.install => debian/libmirplatform6driver-mesa.install

src/platforms/android/display_buffer_builder.h => src/platforms/android/display_component_factory.h

src/platforms/android/output_builder.cpp => src/platforms/android/hal_component_factory.cpp

src/platforms/android/output_builder.h => src/platforms/android/hal_component_factory.h

files modified:
client-ABI-sha1sums

common-ABI-sha1sums

debian/control

debian/rules

include/client/mir_toolkit/mir_surface.h

include/common/mir/geometry/dimensions.h

include/common/mir/geometry/displacement.h

include/common/mir/geometry/size.h

include/common/mir_toolkit/common.h

include/server/mir/scene/surface_creation_parameters.h

platform-ABI-sha1sums

playground/demo-shell/demo_compositor.cpp

server-ABI-sha1sums

src/CMakeLists.txt

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/symbols.map

src/include/platform/mir/options/configuration.h

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

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/platforms/android/CMakeLists.txt

src/platforms/android/display.cpp

src/platforms/android/display.h

src/platforms/android/display_resource_factory.h

src/platforms/android/fb_device.cpp

src/platforms/android/framebuffer_bundle.h

src/platforms/android/framebuffers.cpp

src/platforms/android/framebuffers.h

src/platforms/android/hwc_blanking_control.cpp

src/platforms/android/hwc_configuration.h

src/platforms/android/platform.cpp

src/platforms/android/platform.h

src/platforms/android/resource_factory.cpp

src/platforms/android/resource_factory.h

src/platforms/android/server_render_window.cpp

src/platforms/mesa/display_buffer.cpp

src/protobuf/mir_protobuf.proto

src/server/CMakeLists.txt

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/gl_renderer.cpp

src/server/default_server_configuration.cpp

src/server/frontend/session_mediator.cpp

src/server/report/logging/compositor_report.cpp

src/server/report/logging/compositor_report.h

src/server/report/lttng/compositor_report.cpp

src/server/report/lttng/compositor_report.h

src/server/report/lttng/compositor_report_tp.h

src/server/report/null/compositor_report.cpp

src/server/report/null/compositor_report.h

src/server/scene/surface_creation_parameters.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/include/mir_test_doubles/mock_compositor_report.h

tests/include/mir_test_doubles/mock_framebuffer_bundle.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/integration-tests/client/test_mirsurface.cpp

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

tests/unit-tests/CMakeLists.txt

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

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

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

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

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

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

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

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

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

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

tests/unit-tests/logging/test_compositor_report.cpp

Show diffs side-by-side

added added

removed removed

client-ABI-sha1sums

common-ABI-sha1sums

debian/libmirplatform6.install

include/client/mir_toolkit/mir_surface.h

include/common/mir/geometry/dimensions.h

include/common/mir/geometry/displacement.h

include/common/mir/geometry/size.h

include/common/mir_toolkit/common.h

include/server/mir/scene/surface_creation_parameters.h

platform-ABI-sha1sums

playground/demo-shell/demo_compositor.cpp

server-ABI-sha1sums

src/CMakeLists.txt

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/symbols.map

src/include/common/mir/require.h

src/include/common/mir/require.h

src/include/platform/mir/options/configuration.h

src/include/server/mir/asio_main_loop.h

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

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/platforms/android/CMakeLists.txt

src/platforms/android/display.cpp

src/platforms/android/display.h

src/platforms/android/display_component_factory.h

src/platforms/android/display_resource_factory.h

src/platforms/android/fb_device.cpp

src/platforms/android/framebuffer_bundle.h

src/platforms/android/framebuffers.cpp

src/platforms/android/framebuffers.h

src/platforms/android/hal_component_factory.cpp

src/platforms/android/hal_component_factory.h

src/platforms/android/hwc_blanking_control.cpp

src/platforms/android/hwc_configuration.h

src/platforms/android/platform.cpp

src/platforms/android/platform.h

src/platforms/android/resource_factory.cpp

src/platforms/android/resource_factory.h

src/platforms/android/server_render_window.cpp

src/platforms/mesa/display_buffer.cpp

src/protobuf/mir_protobuf.proto

src/server/CMakeLists.txt

src/server/asio_main_loop.cpp

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/gl_renderer.cpp

src/server/default_server_configuration.cpp

src/server/frontend/session_mediator.cpp

src/server/report/logging/compositor_report.cpp

src/server/report/logging/compositor_report.h

src/server/report/lttng/compositor_report.cpp

src/server/report/lttng/compositor_report.h

src/server/report/lttng/compositor_report_tp.h

src/server/report/null/compositor_report.cpp

src/server/report/null/compositor_report.h

src/server/scene/surface_creation_parameters.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/include/mir_test_doubles/mock_compositor_report.h

tests/include/mir_test_doubles/mock_framebuffer_bundle.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/integration-tests/client/test_mirsurface.cpp

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

tests/unit-tests/CMakeLists.txt

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

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

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

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

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

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

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

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

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

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

tests/unit-tests/logging/test_compositor_report.cpp

tests/unit-tests/test_asio_main_loop.cpp

Older »