~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to src/server/graphics/android/android_platform.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
#include "android_display_allocator.h"
24
24
#include "android_display_factory.h"
25
25
#include "default_framebuffer_factory.h"
 
26
#include "internal_client.h"
26
27
#include "mir/graphics/platform_ipc_package.h"
27
28
#include "mir/graphics/buffer_initializer.h"
28
29
#include "mir/compositor/buffer_id.h"
30
31
namespace mg=mir::graphics;
31
32
namespace mga=mir::graphics::android;
32
33
namespace mc=mir::compositor;
 
34
namespace mf=mir::frontend;
33
35
 
34
36
mga::AndroidPlatform::AndroidPlatform(std::shared_ptr<mg::DisplayReport> const& display_report)
35
37
    : display_report(display_report)
59
61
    return std::make_shared<mg::PlatformIPCPackage>();
60
62
}
61
63
 
62
 
EGLNativeDisplayType mga::AndroidPlatform::shell_egl_display()
 
64
std::shared_ptr<mg::InternalClient> mga::AndroidPlatform::create_internal_client(
 
65
    std::shared_ptr<mf::Surface> const& surface)
63
66
{
64
 
    // TODO: Implement
65
 
    return static_cast<EGLNativeDisplayType>(0);
 
67
    return std::make_shared<mga::InternalClient>(surface);
66
68
}
67
69
 
68
70
std::shared_ptr<mg::Platform> mg::create_platform(std::shared_ptr<DisplayReport> const& display_report)