[mutter] wayland/actor-surface: Do not use geometry scale to constrain regions

[Carlos Garnacho <carlosg src gnome org>]

commit ae1768bf4ff1424fad909c4e4eee8bc852176572
Author: Robert Mader <robert mader posteo de>
Date:   Wed Feb 5 00:43:16 2020 +0100

    wayland/actor-surface: Do not use geometry scale to constrain regions
    
    The regions and the surface size are all in surface coordinates, thus
    don't use the geometry scale, otherwise we might not clip scaled actors
    enough.
    
    See also https://gitlab.gnome.org/GNOME/mutter/merge_requests/148
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/1036

 src/wayland/meta-wayland-actor-surface.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/wayland/meta-wayland-actor-surface.c b/src/wayland/meta-wayland-actor-surface.c
index 1838023be..c25f4ca39 100644
--- a/src/wayland/meta-wayland-actor-surface.c
+++ b/src/wayland/meta-wayland-actor-surface.c
@@ -150,7 +150,6 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
   MetaShapedTexture *stex;
   MetaWaylandBuffer *buffer;
   cairo_rectangle_int_t surface_rect;
-  int geometry_scale;
   MetaWaylandSurface *subsurface_surface;
 
   surface_actor = priv->actor;
@@ -176,11 +175,9 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
       meta_shaped_texture_set_texture (stex, NULL);
     }
 
-  /* Wayland surface coordinate space -> stage coordinate space */
-  geometry_scale = meta_wayland_actor_surface_get_geometry_scale (actor_surface);
   surface_rect = (cairo_rectangle_int_t) {
-    .width = meta_wayland_surface_get_width (surface) * geometry_scale,
-    .height = meta_wayland_surface_get_height (surface) * geometry_scale,
+    .width = meta_wayland_surface_get_width (surface),
+    .height = meta_wayland_surface_get_height (surface),
   };
 
   if (surface->input_region)