From: Benjamin Otte <otte@redhat.com>
Date: Sat, 22 Apr 2023 14:29:58 +0000 (+0200)
Subject: surface: Fold function into its only caller
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~382^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=823eb4c6d9c03772bdac7cb21e8b3e53c36b5f9c;p=gtk4.git

surface: Fold function into its only caller

No other changes
---

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);