From: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed, 1 Dec 2010 14:42:10 +0000 (-0500)
Subject: compositor-wayland: Call wlsc_compositor_finish_frame from frame callback
X-Git-Tag: 0.85.0~355
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ada7ec83ace0be56119ca8b14a568f0efb27cde;p=platform%2Fupstream%2Fwayland.git

compositor-wayland: Call wlsc_compositor_finish_frame from frame callback
---

diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c
index e5d0d84..3ac8c5f 100644
--- a/compositor/compositor-wayland.c
+++ b/compositor/compositor-wayland.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/time.h>
 
 #include "wayland-client.h"
 
@@ -170,11 +169,18 @@ wayland_compositor_init_egl(struct wayland_compositor *c)
 }
 
 static void
+frame_callback(void *data, uint32_t time)
+{
+	struct wayland_compositor *c = (struct wayland_compositor *) data;
+
+	wlsc_compositor_finish_frame(&c->base, time);
+}
+
+static void
 wayland_compositor_present(struct wlsc_compositor *base)
 {
 	struct wayland_compositor *c = (struct wayland_compositor *) base;
 	struct wayland_output *output;
-	struct timeval tv;
 	uint32_t msec;
 
 	glFlush();
@@ -193,10 +199,7 @@ wayland_compositor_present(struct wlsc_compositor *base)
 			          output->base.width, output->base.height);
 	}
 
-
-	gettimeofday(&tv, NULL);
-	msec = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-	wlsc_compositor_finish_frame(&c->base, msec);
+	wl_display_frame_callback(c->parent.display, frame_callback, c);
 }
 
 static int