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

[Benjamin Otte <otte src gnome org>]

commit 4cd4c25c2598e1e7a35b47e18ed7810eaa0952ea
Merge: ed5fb4bbfe bffa5dfddd
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Sat Feb 26 20:15:18 2022 +0000

    Merge branch 'wip/otte/for-main' into 'main'
    
    glrenderer: Don't return NULL form render_texture()
    
    See merge request GNOME/gtk!4522

 gsk/gl/gskglrenderer.c                 |  40 ++++++++++++++++++++++++++++++---
 gsk/gskcairorenderer.c                 |  38 ++++++++++++++++++++++++++++++-
 gtk/gtkflattenlistmodel.c              |  26 ++++++++++-----------
 gtk/gtkgridview.c                      |   2 +-
 gtk/gtklistitemmanager.c               |   2 +-
 gtk/gtklistview.c                      |   2 +-
 testsuite/gsk/compare/huge-height.node |   7 ++++++
 testsuite/gsk/compare/huge-height.png  | Bin 0 -> 689 bytes
 testsuite/gsk/compare/huge-width.node  |   7 ++++++
 testsuite/gsk/compare/huge-width.png   | Bin 0 -> 657 bytes
 testsuite/gsk/meson.build              |   2 ++
 11 files changed, 106 insertions(+), 20 deletions(-)
---