← Back to branch summary

~kdub/mir/fix-1560909

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/test_presentation_chain.cpp

  • Committer: Tarmac
  • Author(s): Cemil Azizoglu
  • Date: 2017-01-18 04:25:27 UTC
  • mfrom: (3944.1.11 mir)
  • Revision ID: tarmac-20170118042527-61plf0z6sjbrccq1
Uncomment deprecations.

Approved by mir-ci-bot, Alan Griffiths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/test_presentation_chain.cpp
68
68
    SurfaceWithChain(SurfaceWithChain const&) = delete;
69
69
    SurfaceWithChain& operator=(SurfaceWithChain const&) = delete;
70
70
 
71
 
    operator MirSurface*()
 
71
    operator MirWindow*()
72
72
    {
73
73
        return window;
74
74
    }
83
83
        mir_window_release_sync(window);
84
84
    }
85
85
protected:
86
 
    SurfaceWithChain(MirConnection* connection, std::function<MirSurface*(Chain&)> const& fn) :
 
86
    SurfaceWithChain(MirConnection* connection, std::function<MirWindow*(Chain&)> const& fn) :
87
87
        chain_(connection),
88
88
        window(fn(chain_))
89
89
    {
105
105
    {
106
106
    }
107
107
private:
108
 
    MirSurface* create_surface(Chain& chain, MirConnection* connection, geom::Size size, MirPixelFormat pf)
 
108
    MirWindow* create_surface(Chain& chain, MirConnection* connection, geom::Size size, MirPixelFormat pf)
109
109
    {
110
110
        auto spec = mir_create_normal_window_spec(
111
111
            connection, size.width.as_int(), size.height.as_int());
129
129
    {
130
130
    }
131
131
private:
132
 
    MirSurface* create_surface(Chain& chain, MirConnection* connection, geom::Size size, MirPixelFormat pf)
 
132
    MirWindow* create_surface(Chain& chain, MirConnection* connection, geom::Size size, MirPixelFormat pf)
133
133
    {
134
134
        MirWindowSpec* spec = mir_create_normal_window_spec(
135
135
            connection, size.width.as_int(), size.height.as_int());