diff options
| author | Hannu Lyytinen <hannu.lyytinen@nomovok.com> | 2012-04-18 23:14:47 +0300 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2012-04-19 09:10:18 +0200 |
| commit | f3fde00e041b5a974f49f994ea96b8db729f96cc (patch) | |
| tree | 8248007ab3f1c5ff5d206ffa232541d826859d41 /src/compositor/wayland_wrapper/wlsurface.cpp | |
| parent | f83a56dcb4b0a81a51e56bb516cb98de75fc6ae5 (diff) | |
Sync up with the latest wayland developments.
This commit makes the qtwayland module compatible with
wayland sha1 677c5180e67be18b7a0867fafb7f205b57a6e9ff.
Change-Id: I5af0510034b7e4a038313b80f1f6e0b18fa48eb3
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/wlsurface.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/wlsurface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/wayland_wrapper/wlsurface.cpp b/src/compositor/wayland_wrapper/wlsurface.cpp index 091f059ff..4f8c6f913 100644 --- a/src/compositor/wayland_wrapper/wlsurface.cpp +++ b/src/compositor/wayland_wrapper/wlsurface.cpp @@ -236,7 +236,7 @@ void Surface::sendFrameCallback() struct wl_resource *frame_callback; wl_list_for_each(frame_callback, &m_frame_callback_list, link) { wl_callback_send_done(frame_callback, time); - wl_resource_destroy(frame_callback,Compositor::currentTimeMsecs()); + wl_resource_destroy(frame_callback); } wl_list_init(&m_frame_callback_list); @@ -429,7 +429,7 @@ const struct wl_surface_interface Surface::surface_interface = { void Surface::surface_destroy(struct wl_client *, struct wl_resource *surface_resource) { - wl_resource_destroy(surface_resource,Compositor::currentTimeMsecs()); + wl_resource_destroy(surface_resource); } void Surface::surface_attach(struct wl_client *client, struct wl_resource *surface, |