← Back to branch summary

~brandontschaefer/mir/deprecate-set-event-handler

« back to all changes in this revision

Viewing changes to include/test/mir_test_framework/visible_surface.h

* Merge parent, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/test/mir_test_framework/visible_surface.h
29
29
class VisibleSurface
30
30
{
31
31
public:
32
 
    explicit VisibleSurface(MirSurfaceSpec* spec);
 
32
    explicit VisibleSurface(MirWindowSpec* spec);
33
33
    VisibleSurface(VisibleSurface&&);
34
34
    VisibleSurface& operator=(VisibleSurface&&);
35
35
    VisibleSurface(VisibleSurface const&) = delete;
43
43
    std::mutex mutex;
44
44
    std::condition_variable cv;
45
45
 
46
 
    MirSurface* surface;
 
46
    MirWindow* window;
47
47
    bool visible;
48
48
};
49
49