diff options
author | Owen W. Taylor <otaylor@fishsoup.net> | 2013-02-12 15:47:38 -0500 |
---|---|---|
committer | Owen W. Taylor <otaylor@fishsoup.net> | 2013-02-14 17:19:52 -0500 |
commit | 515e5f74aadcef7d1d55f593fa16d9e3c1f3fb4b (patch) | |
tree | fd67c7de661cc0d910216dd06fe8ccbc76ea7165 /tests/video-timer.c | |
parent | 5f2d1654a5085fb64af96310e297db4a7c4a39c2 (diff) | |
download | gtk+-515e5f74aadcef7d1d55f593fa16d9e3c1f3fb4b.tar.gz |
Merge GdkFrameHistory into GdkFrameClock
Now that GdkFrameClock is a class, not interface, there's no real advantage
to splitting the frame history into an aggregate object, so directly
merge it into GdkFrameClock.
Diffstat (limited to 'tests/video-timer.c')
-rw-r--r-- | tests/video-timer.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/video-timer.c b/tests/video-timer.c index 32d8880b78..69ae562410 100644 --- a/tests/video-timer.c +++ b/tests/video-timer.c @@ -221,9 +221,7 @@ on_window_draw (GtkWidget *widget, if (displayed_frame->frame_counter == 0) { GdkFrameClock *frame_clock = gtk_widget_get_frame_clock (window); - GdkFrameHistory *history = gdk_frame_clock_get_history (frame_clock); - - displayed_frame->frame_counter = gdk_frame_history_get_frame_counter (history); + displayed_frame->frame_counter = gdk_frame_clock_get_frame_counter (clock); } } } @@ -232,7 +230,6 @@ static void collect_old_frames (void) { GdkFrameClock *frame_clock = gtk_widget_get_frame_clock (window); - GdkFrameHistory *history = gdk_frame_clock_get_history (frame_clock); GList *l, *l_next; for (l = past_frames; l; l = l_next) @@ -241,8 +238,8 @@ collect_old_frames (void) gboolean remove = FALSE; l_next = l->next; - GdkFrameTimings *timings = gdk_frame_history_get_timings (history, - frame_data->frame_counter); + GdkFrameTimings *timings = gdk_frame_clock_get_timings (clock, + frame_data->frame_counter); if (timings == NULL) { remove = TRUE; |