[gtk: 5/5] Merge branch 'surface-scale' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 1b961a9ae2ae262f97288e5da6e437d5502c4808
Merge: 61a7ebf980 f14762b026
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jan 17 05:23:22 2021 +0000

    Merge branch 'surface-scale' into 'master'
    
    Surface scale
    
    Closes #3578
    
    See merge request GNOME/gtk!3085

 gdk/gdksurface.c                 | 12 ++++++++++++
 gdk/wayland/gdksurface-wayland.c | 16 +++++++++++++---
 gdk/x11/gdksurface-x11.c         |  2 ++
 gtk/gtknative.c                  | 16 ++++++++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)
---