commit fbbbec8ef51b5b3e2aa6795e24b1236e222bb1c9
author Jason Ekstrand <jason@jlekstrand.net> Fri Jun 14 10:07:57 2013 -0500
committer Kristian Høgsberg <krh@bitplanet.net> Fri Jun 14 16:49:10 2013 -0400
tree 99361505ad5b1463cc5baf72541af290739c7a6b
parent 8895efcd0d35f5e7946d6d20c0753deada294ffb

callback: Change resource to a wl_resource pointer

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 91c2f94..38ef095 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1004,7 +1004,7 @@
 }
 
 struct weston_frame_callback {
-	struct wl_resource resource;
+	struct wl_resource *resource;
 	struct wl_list link;
 };
 
@@ -1029,7 +1029,7 @@
 
 	wl_list_for_each_safe(cb, next,
 			      &surface->pending.frame_callback_list, link)
-		wl_resource_destroy(&cb->resource);
+		wl_resource_destroy(cb->resource);
 
 	pixman_region32_fini(&surface->pending.input);
 	pixman_region32_fini(&surface->pending.opaque);
@@ -1049,7 +1049,7 @@
 	pixman_region32_fini(&surface->input);
 
 	wl_list_for_each_safe(cb, next, &surface->frame_callback_list, link)
-		wl_resource_destroy(&cb->resource);
+		wl_resource_destroy(cb->resource);
 
 	weston_surface_set_transform_parent(surface, NULL);
 
@@ -1306,8 +1306,8 @@
 	wl_event_loop_dispatch(ec->input_loop, 0);
 
 	wl_list_for_each_safe(cb, cnext, &frame_callback_list, link) {
-		wl_callback_send_done(&cb->resource, msecs);
-		wl_resource_destroy(&cb->resource);
+		wl_callback_send_done(cb->resource, msecs);
+		wl_resource_destroy(cb->resource);
 	}
 
 	wl_list_for_each_safe(animation, next, &output->animation_list, link) {
@@ -1446,7 +1446,7 @@
 static void
 destroy_frame_callback(struct wl_resource *resource)
 {
-	struct weston_frame_callback *cb = resource->data;
+	struct weston_frame_callback *cb = wl_resource_get_user_data(resource);
 
 	wl_list_remove(&cb->link);
 	free(cb);
@@ -1465,13 +1465,10 @@
 		return;
 	}
 
-	cb->resource.object.interface = &wl_callback_interface;
-	cb->resource.object.id = callback;
-	cb->resource.destroy = destroy_frame_callback;
-	cb->resource.client = client;
-	cb->resource.data = cb;
+	cb->resource = wl_client_add_object(client, &wl_callback_interface,
+					    NULL, callback, cb);
+	wl_resource_set_destructor(cb->resource, destroy_frame_callback);
 
-	wl_client_add_resource(client, &cb->resource);
 	wl_list_insert(surface->pending.frame_callback_list.prev, &cb->link);
 }
 
@@ -2128,7 +2125,7 @@
 	struct weston_frame_callback *cb, *tmp;
 
 	wl_list_for_each_safe(cb, tmp, &sub->cached.frame_callback_list, link)
-		wl_resource_destroy(&cb->resource);
+		wl_resource_destroy(cb->resource);
 
 	weston_buffer_reference(&sub->cached.buffer_ref, NULL);
 	pixman_region32_fini(&sub->cached.damage);