[mutter/gbsneto/content: 342/346] wayland/actor-surface: Set geometry scale in surface actor

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 8fe497cfa1f415d909322cef4ec24d239038707b
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Jul 9 12:29:37 2019 -0300

    wayland/actor-surface: Set geometry scale in surface actor
    
    Now that MetaShapedTexture is a ClutterContent implemetation that
    is aware of its own buffer scale, it is possible to simplify the
    event translation routines.
    
    Set the geometry scale in MetaSurfaceActor, and stop adjusting the
    surface scale when translating points.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/409

 src/wayland/meta-wayland-actor-surface.c | 1 +
 src/wayland/meta-wayland-surface.c       | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/src/wayland/meta-wayland-actor-surface.c b/src/wayland/meta-wayland-actor-surface.c
index 979422bae..b2b6c27f3 100644
--- a/src/wayland/meta-wayland-actor-surface.c
+++ b/src/wayland/meta-wayland-actor-surface.c
@@ -164,6 +164,7 @@ meta_wayland_actor_surface_real_sync_actor_state (MetaWaylandActorSurface *actor
 
   /* Wayland surface coordinate space -> stage coordinate space */
   geometry_scale = meta_wayland_actor_surface_get_geometry_scale (actor_surface);
+  clutter_actor_set_scale (CLUTTER_ACTOR (surface_actor), geometry_scale, geometry_scale);
 
   surface_rect = (cairo_rectangle_int_t) {
     .width = meta_wayland_surface_get_width (surface) * geometry_scale,
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index f9cc118b6..787265f33 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1584,8 +1584,6 @@ meta_wayland_surface_get_relative_coordinates (MetaWaylandSurface *surface,
         CLUTTER_ACTOR (meta_wayland_surface_get_actor (surface));
 
       clutter_actor_transform_stage_point (actor, abs_x, abs_y, sx, sy);
-      *sx /= surface->scale;
-      *sy /= surface->scale;
     }
 }