From: Benjamin Otte <otte@redhat.com>
Date: Wed, 21 Mar 2018 20:58:08 +0000 (+0100)
Subject: surface: Make process_updates no longer be a vfunc
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~821
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b01ee88f11b85ef3370f5b70d0800abff561c163;p=gtk4.git

surface: Make process_updates no longer be a vfunc
---

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index dd23991014..e17b355200 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -318,9 +318,6 @@ GdkDrawingContext *gdk_surface_get_drawing_context (GdkSurface *surface);
 
 cairo_region_t *gdk_surface_get_current_paint_region (GdkSurface *surface);
 
-void       _gdk_surface_process_updates_recurse (GdkSurface *surface,
-                                                 cairo_region_t *expose_region);
-
 /*****************************************
  * Interfaces provided by windowing code *
  *****************************************/
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index b2cdc558be..fd3c213506 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -2067,9 +2067,9 @@ gdk_surface_schedule_update (GdkSurface *surface)
                                    GDK_FRAME_CLOCK_PHASE_PAINT);
 }
 
-void
-_gdk_surface_process_updates_recurse (GdkSurface *surface,
-                                      cairo_region_t *expose_region)
+static void
+gdk_surface_process_updates_recurse (GdkSurface *surface,
+                                     cairo_region_t *expose_region)
 {
   GdkEvent *event;
 
@@ -2093,8 +2093,6 @@ _gdk_surface_process_updates_recurse (GdkSurface *surface,
 static void
 gdk_surface_process_updates_internal (GdkSurface *surface)
 {
-  GdkSurfaceImplClass *impl_class;
-
   /* Ensure the surface lives while updating it */
   g_object_ref (surface);
 
@@ -2117,9 +2115,7 @@ gdk_surface_process_updates_internal (GdkSurface *surface)
 
           expose_region = cairo_region_copy (surface->active_update_area);
 
-          impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
-
-          impl_class->process_updates_recurse (surface, expose_region);
+          gdk_surface_process_updates_recurse (surface, expose_region);
 
           gdk_surface_append_old_updated_area (surface, surface->active_update_area);
 
diff --git a/gdk/gdksurfaceimpl.c b/gdk/gdksurfaceimpl.c
index f5c7330198..0ca16f7dbc 100644
--- a/gdk/gdksurfaceimpl.c
+++ b/gdk/gdksurfaceimpl.c
@@ -325,19 +325,11 @@ gdk_surface_impl_move_to_rect (GdkSurface          *surface,
                          flipped_y);
 }
 
-static void
-gdk_surface_impl_process_updates_recurse (GdkSurface      *surface,
-                                         cairo_region_t *region)
-{
-  _gdk_surface_process_updates_recurse (surface, region);
-}
-
 static void
 gdk_surface_impl_class_init (GdkSurfaceImplClass *impl_class)
 {
   impl_class->beep = gdk_surface_impl_beep;
   impl_class->move_to_rect = gdk_surface_impl_move_to_rect;
-  impl_class->process_updates_recurse = gdk_surface_impl_process_updates_recurse;
 }
 
 static void
diff --git a/gdk/gdksurfaceimpl.h b/gdk/gdksurfaceimpl.h
index 5e089571bc..88d185bb9a 100644
--- a/gdk/gdksurfaceimpl.h
+++ b/gdk/gdksurfaceimpl.h
@@ -211,9 +211,6 @@ struct _GdkSurfaceImplClass
                                          gint              dx,
                                          gint              dy);
 
-  void         (*process_updates_recurse) (GdkSurface      *surface,
-                                           cairo_region_t *region);
-
   gint         (* get_scale_factor)       (GdkSurface      *surface);
   void         (* get_unscaled_size)      (GdkSurface      *surface,
                                            int            *unscaled_width,