← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/integration-tests/test_display_server_main_loop_events.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration-tests/test_display_server_main_loop_events.cpp
97
97
 
98
98
    MOCK_METHOD0(pause, void());
99
99
    MOCK_METHOD0(resume, void());
 
100
    std::weak_ptr<mg::Cursor> the_cursor() { return {}; }
100
101
 
101
102
private:
102
103
    std::shared_ptr<mg::Display> const display;