← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mir/utopic-proposed

« back to all changes in this revision

Viewing changes to src/platform/graphics/android/android_display.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-03-10 19:28:46 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: package-import@ubuntu.com-20140310192846-rq9qm3ec26yrelo2
Tags: upstream-0.1.6+14.04.20140310
Import upstream version 0.1.6+14.04.20140310

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platform/graphics/android/android_display.h
19
19
#ifndef MIR_GRAPHICS_ANDROID_ANDROID_DISPLAY_H_
20
20
#define MIR_GRAPHICS_ANDROID_ANDROID_DISPLAY_H_
21
21
 
22
 
#include "display_buffer.h"
23
22
#include "mir/graphics/display.h"
24
 
#include "android_display_configuration.h"
25
23
#include "gl_context.h"
26
24
 
27
25
#include <memory>
35
33
 
36
34
namespace android
37
35
{
38
 
class DisplayDevice;
39
 
 
40
36
class DisplayBuilder;
41
37
class DisplaySupportProvider;
 
38
class ConfigurableDisplayBuffer;
42
39
 
43
40
class AndroidDisplay : public Display
44
41
{
69
66
private:
70
67
    std::shared_ptr<DisplayBuilder> const display_builder;
71
68
    GLContext gl_context;
72
 
    std::shared_ptr<DisplayDevice> const display_device;
 
69
 
73
70
    //we only have a primary display at the moment
74
 
    std::unique_ptr<graphics::DisplayBuffer> const display_buffer;
75
 
    AndroidDisplayConfiguration current_configuration;
 
71
    std::unique_ptr<ConfigurableDisplayBuffer> const display_buffer;
76
72
};
77
73
 
78
74
}