~albaguirre/mir/backport-fixes-to-0.11

Viewing changes to src/platforms/android/server/display.cpp

Committer: Tarmac
Author(s): Kevin DuBois
Date: 2015-01-29 16:35:31 UTC
mfrom: (2215.3.26 pull-list-from-device)
Revision ID: tarmac-20150129163531-oklyqevk921mxuq3

android: pull the mga::LayerList instance from the mga::HwcDevice to the mga::DisplayBuffer.

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

files modified:
src/platforms/android/server/display.cpp

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/display_buffer.h

src/platforms/android/server/display_component_factory.h

src/platforms/android/server/display_device.h

src/platforms/android/server/fb_device.cpp

src/platforms/android/server/fb_device.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hal_component_factory.h

src/platforms/android/server/hwc_device.cpp

src/platforms/android/server/hwc_device.h

src/platforms/android/server/hwc_fb_device.cpp

src/platforms/android/server/hwc_fb_device.h

tests/include/mir_test_doubles/mock_display_device.h

tests/include/mir_test_doubles/stub_display_builder.h

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

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

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

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

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

Show diffs side-by-side

added added

removed removed

src/platforms/android/server/display.cpp

#include "interpreter_cache.h"

#include "server_render_window.h"

#include "display_buffer.h"

#include "hwc_layerlist.h"

#include "mir/graphics/android/mir_native_window.h"

#include "mir/geometry/rectangle.h"

#include "mir/graphics/event_handler_register.h"

auto interpreter = std::make_shared<mga::ServerRenderWindow>(fbs, cache);

auto native_window = std::make_shared<mga::MirNativeWindow>(interpreter);

return std::unique_ptr<mga::ConfigurableDisplayBuffer>(new mga::DisplayBuffer(

display_buffer_builder.create_layer_list(),

fbs,

display_buffer_builder.create_display_device(),

native_window,

Older »