← Back to branch summary

~vanvugt/mir/frontend-server

~vanvugt/mir/frontend-server

« back to all changes in this revision

Viewing changes to src/platform/graphics/android/internal_client_window.cpp

Committer: Daniel van Vugt
Date: 2014-04-15 03:51:25 UTC
mfrom: (1416.1.134 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140415035125-qvrycnzs1b86qgc7

Merge latest development-branch and fix conflicts

files added:
include/test/mir_test/spin_wait.h

include/test/mir_test_doubles/null_display_buffer_compositor_factory.h

tests/acceptance-tests/test_client_surface_swap_buffers.cpp

tests/integration-tests/session_management.cpp

tests/mir_test/spin_wait.cpp

files removed:
include/server/mir/scene/surface_ranker.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_factory.h

include/test/mir_test_doubles/mock_surface_factory.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/rendering_operator.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/null_session_listener.h => include/server/mir/scene/null_session_listener.h

include/server/mir/shell/placement_strategy.h => include/server/mir/scene/placement_strategy.h

include/server/mir/shell/session.h => include/server/mir/scene/session.h

include/server/mir/shell/session_listener.h => include/server/mir/scene/session_listener.h

include/server/mir/shell/snapshot.h => include/server/mir/scene/snapshot.h

include/server/mir/shell/surface_buffer_access.h => include/server/mir/scene/surface_buffer_access.h

include/server/mir/shell/surface_creation_parameters.h => include/server/mir/scene/surface_creation_parameters.h

include/test/mir_test_doubles/mock_shell_session.h => include/test/mir_test_doubles/mock_scene_session.h

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

include/test/mir_test_doubles/stub_shell_session.h => include/test/mir_test_doubles/stub_scene_session.h

tests/unit-tests/graphics/mesa/test_overlapping_output_grouping.cpp => tests/unit-tests/graphics/test_overlapping_output_grouping.cpp

files modified:
CMakeLists.txt

cmake/FindGtest.cmake

cmake/LinuxCrossCompile.cmake

cmake/MirCommon.cmake

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

examples/demo-shell/demo_shell.cpp

examples/demo-shell/fullscreen_placement_strategy.cpp

examples/demo-shell/fullscreen_placement_strategy.h

examples/demo-shell/window_manager.cpp

examples/render_overlays.cpp

examples/render_surfaces.cpp

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

include/server/mir/frontend/session.h

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/shell/focus_controller.h

include/server/mir/shell/focus_setter.h

include/test/mir_test/wait_condition.h

include/test/mir_test_doubles/fake_renderable.h

include/test/mir_test_doubles/mock_focus_setter.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_server.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/mock_session_listener.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/null_session_event_sink.h

include/test/mir_test_doubles/null_snapshot_strategy.h

include/test/mir_test_doubles/stub_renderable.h

include/test/mir_test_doubles/stub_server.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_framework/declarative_placement_strategy.h

src/client/android/client_surface_interpreter.cpp

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.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/internal_client_window.cpp

src/platform/graphics/android/server_render_window.cpp

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/display.cpp

src/platform/graphics/overlapping_output_grouping.cpp

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

src/server/compositor/switching_bundle.cpp

src/server/default_server_configuration.cpp

src/server/frontend/session_mediator.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/broadcasting_session_event_sink.cpp

src/server/scene/broadcasting_session_event_sink.h

src/server/scene/default_configuration.cpp

src/server/scene/default_session_container.cpp

src/server/scene/default_session_container.h

src/server/scene/gl_pixel_buffer.cpp

src/server/scene/global_event_sender.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/session_container.h

src/server/scene/session_event_handler_register.h

src/server/scene/session_event_sink.h

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/snapshot_strategy.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/scene/threaded_snapshot_strategy.cpp

src/server/scene/threaded_snapshot_strategy.h

src/server/shell/CMakeLists.txt

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/consuming_placement_strategy.h

src/server/shell/default_configuration.cpp

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_focus_mechanism.h

src/server/shell/surface_creation_parameters.cpp

src/utils/screencast.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/CMakeLists.txt

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

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/mir_test/CMakeLists.txt

tests/mir_test_framework/declarative_placement_strategy.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/unit-tests/client/android/test_client_surface_interpreter.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_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_switching_bundle.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/graphics/CMakeLists.txt

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

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

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

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

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

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_broadcasting_session_event_sink.cpp

tests/unit-tests/scene/test_default_focus_mechanism.cpp

tests/unit-tests/scene/test_gl_pixel_buffer.cpp

tests/unit-tests/scene/test_global_event_sender.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_stack.cpp

tests/unit-tests/scene/test_the_session_container_implementation.cpp

tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

Show diffs side-by-side

added added

removed removed

src/platform/graphics/android/internal_client_window.cpp

93

93

return 0;

94

94

case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS:

95

95

return 1;

96

case NATIVE_WINDOW_CONCRETE_TYPE:

97

return NATIVE_WINDOW_SURFACE;

96

98

default:

97

99

{

98

100

std::stringstream sstream;

Older »