[gtk: 17/17] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 0ca573142a74f6feaa12f7b9124c46f4c0d6f02e
Merge: 1c419f762b a1ece16143
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 5 13:19:29 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    textlayout: Remove some unnecessary code
    
    See merge request GNOME/gtk!3400

 gsk/ngl/gsknglrenderjob.c  |   2 +-
 gtk/gtktextattributes.c    |  13 +--
 gtk/gtktextattributes.h    |   1 +
 gtk/gtktextbtree.c         | 191 ++++++++++-----------------------
 gtk/gtktextbtree.h         |   3 +-
 gtk/gtktextiter.c          |  49 ++++-----
 gtk/gtktextlayout.c        | 257 ++++++++++++++++-----------------------------
 gtk/gtktextlayoutprivate.h |   4 -
 gtk/gtktexttag.c           |  49 +--------
 gtk/gtktexttagprivate.h    |   6 +-
 10 files changed, 180 insertions(+), 395 deletions(-)
---