Merge branch 'master' into 'master'

Add proper annotation for gdk_frame_clock_get_refresh_info

See merge request GNOME/gtk!55
This commit is contained in:
Christoph Reiter 2018-03-13 20:30:53 +00:00
commit f91ea2ce37

View File

@ -537,10 +537,10 @@ _gdk_frame_clock_debug_print_timings (GdkFrameClock *clock,
* gdk_frame_clock_get_refresh_info:
* @frame_clock: a #GdkFrameClock
* @base_time: base time for determining a presentaton time
* @refresh_interval_return: a location to store the determined refresh
* interval, or %NULL. A default refresh interval of 1/60th of
* a second will be stored if no history is present.
* @presentation_time_return: a location to store the next
* @refresh_interval_return: (out) (optional): a location to store the
* determined refresh interval, or %NULL. A default refresh interval of
* 1/60th of a second will be stored if no history is present.
* @presentation_time_return: (out): a location to store the next
* candidate presentation time after the given base time.
* 0 will be will be stored if no history is present.
*