[gtk: 4/4] Merge branch 'wip/otte/for-master' into 'master'

[Benjamin Otte <otte src gnome org>]

commit a1c1ad317ba428f460563dbcd8d4ba816984a69c
Merge: cbda61d3fb dbd19bf27a
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Mon Mar 15 02:31:45 2021 +0000

    Merge branch 'wip/otte/for-master' into 'master'
    
    Wip/otte/for master
    
    See merge request GNOME/gtk!3297

 gdk/gdksurface.c             | 31 -----------------
 gdk/gdksurfaceprivate.h      |  6 ----
 gdk/win32/gdksurface-win32.c | 30 +++--------------
 gdk/win32/gdksurface-win32.h |  2 --
 gdk/x11/gdksurface-x11.c     | 79 ++++++++++++++++++++++++--------------------
 gdk/x11/gdksurface-x11.h     |  1 -
 gsk/ngl/gsknglrenderer.c     |  5 +--
 7 files changed, 48 insertions(+), 106 deletions(-)
---