← Back to branch summary

~ci-train-bot/mir/mir-ubuntu-yakkety-2783

« back to all changes in this revision

Viewing changes to tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

* Merge trunk fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp
54
54
public:
55
55
    EGLNativeWindowType egl_native_window() override { return {}; }
56
56
 
57
 
    void set_event_handler(mir_surface_event_callback cb, void* ctx) override
 
57
    void set_event_handler(MirWindowEventCallback cb, void* ctx) override
58
58
    {
59
59
        std::lock_guard<std::mutex> lock{event_mutex};
60
60
        event_handler = cb;
79
79
    }
80
80
private:
81
81
    std::mutex event_mutex;
82
 
    mir_surface_event_callback event_handler;
 
82
    MirWindowEventCallback event_handler;
83
83
    void* event_context;
84
84
};
85
85
 
86
86
struct MockHostSurface : mgn::HostSurface
87
87
{
88
88
    MOCK_METHOD0(egl_native_window, EGLNativeWindowType());
89
 
    MOCK_METHOD2(set_event_handler, void(mir_surface_event_callback, void*));
 
89
    MOCK_METHOD2(set_event_handler, void(MirWindowEventCallback, void*));
90
90
    MOCK_METHOD1(apply_spec, void(mgn::HostSurfaceSpec&));
91
91
};
92
92