From 52583a41bdf3a06729a376825e4987695998eab9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 23 Mar 2019 09:35:14 -0400
Subject: [PATCH] surface: Simplify some code

Fold gdk_surface_process_updates_recurse into its
only caller. There is no recursion here anymore.
---
 gdk/gdksurface.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 3b3095201a..f70b73a0e4 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -1110,22 +1110,6 @@ gdk_surface_schedule_update (GdkSurface *surface)
                                    GDK_FRAME_CLOCK_PHASE_PAINT);
 }
 
-static void
-gdk_surface_process_updates_recurse (GdkSurface *surface,
-                                     cairo_region_t *expose_region)
-{
-  gboolean handled;
-
-  if (surface->destroyed)
-    return;
-
-  /* Paint the surface before the children, clipped to the surface region */
-  g_signal_emit (surface, signals[RENDER], 0, expose_region, &handled);
-}
-
-/* Process and remove any invalid area on the native surface by creating
- * expose events for the surface and all non-native descendants.
- */
 static void
 gdk_surface_process_updates_internal (GdkSurface *surface)
 {
@@ -1148,10 +1132,11 @@ gdk_surface_process_updates_internal (GdkSurface *surface)
       if (gdk_surface_is_viewable (surface))
         {
           cairo_region_t *expose_region;
+          gboolean handled;
 
           expose_region = cairo_region_copy (surface->active_update_area);
 
-          gdk_surface_process_updates_recurse (surface, expose_region);
+          g_signal_emit (surface, signals[RENDER], 0, expose_region, &handled);
 
           cairo_region_destroy (expose_region);
         }