From: Benjamin Otte <otte@redhat.com>
Date: Sat, 22 Apr 2023 14:24:16 +0000 (+0200)
Subject: surface: Remove in_update tracking
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~382^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=040af44b005b4a4ef7290f9b15a4d7f4d4234351;p=gtk4.git

surface: Remove in_update tracking

It's 2023, we use frame clocks now and don't have nested surface drawing
anymore.
---

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 279bafd6ad..2de27870cc 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -1338,8 +1338,6 @@ gdk_surface_process_updates_internal (GdkSurface *surface)
   /* Ensure the surface lives while updating it */
   g_object_ref (surface);
 
-  surface->in_update = TRUE;
-
   /* 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.
@@ -1361,8 +1359,6 @@ gdk_surface_process_updates_internal (GdkSurface *surface)
       cairo_region_destroy (expose_region);
     }
 
-  surface->in_update = FALSE;
-
   g_object_unref (surface);
 }
 
@@ -1433,11 +1429,7 @@ gdk_surface_paint_on_clock (GdkFrameClock *clock,
 
   if (surface->update_area &&
       !surface->update_freeze_count &&
-      !gdk_surface_is_toplevel_frozen (surface) &&
-
-      /* Don't recurse into process_updates_internal, we'll
-       * do the update later when idle instead. */
-      !surface->in_update)
+      !gdk_surface_is_toplevel_frozen (surface))
     {
       surface->pending_phases &= ~GDK_FRAME_CLOCK_PHASE_PAINT;
       gdk_surface_process_updates_internal (surface);
diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index 8b210439a5..a8587a8442 100644
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -67,7 +67,6 @@ struct _GdkSurface
 
   guint modal_hint : 1;
   guint destroyed : 2;
-  guint in_update : 1;
   guint frame_clock_events_paused : 1;
   guint autohide : 1;
   guint shortcuts_inhibited : 1;