From 823eb4c6d9c03772bdac7cb21e8b3e53c36b5f9c Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 22 Apr 2023 16:29:58 +0200 Subject: [PATCH] surface: Fold function into its only caller No other changes --- gdk/gdksurface.c | 57 ++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index d34fbf3519..385f5e3e91 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -1298,36 +1298,6 @@ gdk_surface_schedule_update (GdkSurface *surface) GDK_FRAME_CLOCK_PHASE_PAINT); } -static void -gdk_surface_process_updates_internal (GdkSurface *surface) -{ - /* Ensure the surface lives while updating it */ - g_object_ref (surface); - - /* If an update got queued during update processing, we can get a - * surface in the update queue that has an empty update_area. - * just ignore it. - */ - if (surface->update_area) - { - cairo_region_t *expose_region; - - expose_region = surface->update_area; - surface->update_area = NULL; - - if (GDK_SURFACE_IS_MAPPED (surface)) - { - gboolean handled; - - g_signal_emit (surface, signals[RENDER], 0, expose_region, &handled); - } - - cairo_region_destroy (expose_region); - } - - g_object_unref (surface); -} - static void gdk_surface_layout_on_clock (GdkFrameClock *clock, void *data) @@ -1398,7 +1368,32 @@ gdk_surface_paint_on_clock (GdkFrameClock *clock, !gdk_surface_is_toplevel_frozen (surface)) { surface->pending_phases &= ~GDK_FRAME_CLOCK_PHASE_PAINT; - gdk_surface_process_updates_internal (surface); + + /* Ensure the surface lives while updating it */ + g_object_ref (surface); + + /* If an update got queued during update processing, we can get a + * surface in the update queue that has an empty update_area. + * just ignore it. + */ + if (surface->update_area) + { + cairo_region_t *expose_region; + + expose_region = surface->update_area; + surface->update_area = NULL; + + if (GDK_SURFACE_IS_MAPPED (surface)) + { + gboolean handled; + + g_signal_emit (surface, signals[RENDER], 0, expose_region, &handled); + } + + cairo_region_destroy (expose_region); + } + + g_object_unref (surface); } g_object_unref (surface); -- 2.30.2