[gtk/wip/otte/gdk: 6/12] surface: Pass width/height/scale to update_size()

[Benjamin Otte <otte src gnome org>]

commit 13b45fe2701b6a4a25f3022b7cc5ea65d8c0afa8
Author: Benjamin Otte <otte redhat com>
Date:   Thu Mar 18 04:33:39 2021 +0100

    surface: Pass width/height/scale to update_size()
    
    This is preparation for letting gdk_surface_update_size() actually do
    the size updating.

 gdk/broadway/gdksurface-broadway.c | 2 +-
 gdk/gdksurface.c                   | 5 ++++-
 gdk/gdksurfaceprivate.h            | 6 +++++-
 gdk/macos/GdkMacosWindow.c         | 2 +-
 gdk/wayland/gdksurface-wayland.c   | 2 +-
 gdk/win32/gdksurface-win32.c       | 2 +-
 gdk/x11/gdksurface-x11.c           | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 36930072c4..ee7b6e393a 100644
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -519,7 +519,7 @@ gdk_broadway_surface_move_resize_internal (GdkSurface *surface,
   if (size_changed)
     {
       surface->resize_count++;
-      _gdk_surface_update_size (surface);
+      gdk_surface_update_size (surface, surface->width, surface->height, gdk_surface_get_scale_factor 
(surface));
     }
 }
 
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index dad345a4c0..df10fe65d4 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -814,7 +814,10 @@ gdk_surface_get_property (GObject    *object,
 }
 
 void
-_gdk_surface_update_size (GdkSurface *surface)
+gdk_surface_update_size (GdkSurface *surface,
+                         int         width,
+                         int         height,
+                         int         scale)
 {
   GSList *l;
 
diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h
index 90f5bcba2d..dfee670b40 100644
--- a/gdk/gdksurfaceprivate.h
+++ b/gdk/gdksurfaceprivate.h
@@ -255,6 +255,11 @@ gdk_gravity_flip_vertically (GdkGravity anchor)
   g_assert_not_reached ();
 }
 
+void                    gdk_surface_update_size                 (GdkSurface             *surface,
+                                                                 int                     width,
+                                                                 int                     height,
+                                                                 int                     scale);
+
 void       _gdk_surface_destroy           (GdkSurface      *surface,
                                            gboolean        foreign_destroy);
 void       gdk_surface_invalidate_rect    (GdkSurface           *surface,
@@ -262,7 +267,6 @@ void       gdk_surface_invalidate_rect    (GdkSurface           *surface,
 void       gdk_surface_invalidate_region  (GdkSurface           *surface,
                                            const cairo_region_t *region);
 void       _gdk_surface_clear_update_area (GdkSurface      *surface);
-void       _gdk_surface_update_size       (GdkSurface      *surface);
 
 GdkGLContext * gdk_surface_get_paint_gl_context (GdkSurface *surface,
                                                  GError   **error);
diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c
index 3afcdeb826..f1e5602a36 100644
--- a/gdk/macos/GdkMacosWindow.c
+++ b/gdk/macos/GdkMacosWindow.c
@@ -256,7 +256,7 @@ typedef NSString *CALayerContentsGravity;
 
   [[self contentView] setFrame:NSMakeRect (0, 0, surface->width, surface->height)];
 
-  _gdk_surface_update_size (surface);
+  gdk_surface_update_size (surface, surface->width, surface->height, gdk_surface_get_scale_factor (surface));
 
   gdk_surface_request_layout (surface);
 
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index ca85fc75a2..ea45b42711 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -438,7 +438,7 @@ gdk_wayland_surface_update_size (GdkSurface *surface,
   if (scale_changed)
     g_object_notify (G_OBJECT (surface), "scale-factor");
 
-  _gdk_surface_update_size (surface);
+  gdk_surface_update_size (surface, surface->width, surface->height, impl->scale);
 }
 
 static const char *
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 03250491d4..c7736c9cc6 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -4583,7 +4583,7 @@ _gdk_win32_surface_compute_size (GdkSurface *surface)
       surface->width = impl->next_layout.configured_width;
       surface->height = impl->next_layout.configured_height;
 
-      _gdk_surface_update_size (surface);
+      gdk_surface_update_size (surface, surface->width, surface->height, gdk_surface_get_scale_factor 
(surface));
     }
 
   return FALSE;
diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
index 210f584d64..af264b4e83 100644
--- a/gdk/x11/gdksurface-x11.c
+++ b/gdk/x11/gdksurface-x11.c
@@ -207,7 +207,7 @@ gdk_x11_surface_update_size (GdkX11Surface *self,
   surface->height = height;
   self->surface_scale = scale;
 
-  _gdk_surface_update_size (surface);
+  gdk_surface_update_size (surface, surface->width, surface->height, self->surface_scale);
 
   if (self->cairo_surface)
     {