[mutter/gnome-3-14] Revert "wayland-surface: Apply the surface scale only if needed"

[Adel Gadllah <agadllah src gnome org>]

commit a8eb42e43c0785630e6e8d54acc3c57b498b2bca
Author: Adel Gadllah <adel gadllah gmail com>
Date:   Sat Oct 25 12:26:19 2014 +0200

    Revert "wayland-surface: Apply the surface scale only if needed"
    
    This commit is wrong, it assumes that the scale only applies to the one
    set by the client but its not. meta_surface_actor_wayland_scale_texture
    also handles the output scale. Revert the commit to fix hidpi for wayland
    clients like weston-terminal.
    
    This reverts commit 0364ea91403cfc1c675c2776dda50aff4fb3788b.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739161

 src/wayland/meta-wayland-surface.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index c61598b..cda727c 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -393,10 +393,7 @@ commit_pending_state (MetaWaylandSurface      *surface,
     }
 
   if (pending->scale > 0)
-    {
-      surface->scale = pending->scale;
-      meta_surface_actor_wayland_scale_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor));
-    }
+    surface->scale = pending->scale;
 
   if (!cairo_region_is_empty (pending->damage))
     surface_process_damage (surface, pending->damage);
@@ -415,6 +412,9 @@ commit_pending_state (MetaWaylandSurface      *surface,
       meta_surface_actor_set_input_region (surface->surface_actor, pending->input_region);
     }
 
+  /* scale surface texture */
+  meta_surface_actor_wayland_scale_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor));
+
   /* wl_surface.frame */
   wl_list_insert_list (&compositor->frame_callbacks, &pending->frame_callback_list);
   wl_list_init (&pending->frame_callback_list);