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



commit 321a21015ecc88dd51be2f665ea25cbc374e5c26
Merge: fc2dc82b70 63a8144e1a
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Tue May 21 05:22:41 2019 +0000

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

 gdk/gdkrgbaprivate.h                               |   11 +
 gsk/gl/gskglrenderer.c                             |   20 +-
 gsk/gskrendernode.c                                |   28 -
 gsk/gskrendernode.h                                |    9 +-
 gsk/gskrendernodeimpl.c                            |   53 +-
 gsk/gskrendernodeparser.c                          |  817 +++++++----
 gsk/gskrendernodeparserprivate.h                   |    1 -
 gsk/meson.build                                    |    2 +-
 gsk/vulkan/gskvulkancolortextpipeline.c            |    7 +-
 gsk/vulkan/gskvulkancolortextpipelineprivate.h     |    3 +-
 gsk/vulkan/gskvulkanrenderpass.c                   |    6 +-
 gsk/vulkan/gskvulkantextpipeline.c                 |    7 +-
 gsk/vulkan/gskvulkantextpipelineprivate.h          |    3 +-
 gtk/gtksnapshot.c                                  |    3 +-
 gtk/inspector/recorder.c                           |    5 +-
 tests/rendernode-create-tests.c                    |    2 +-
 testsuite/gsk/compare-render.c                     |   39 +-
 testsuite/gsk/compare/empty-blend.node             |    1 +
 testsuite/gsk/compare/empty-blend.png              |  Bin 0 -> 153 bytes
 testsuite/gsk/compare/empty-blur.node              |   20 +
 testsuite/gsk/compare/empty-blur.png               |  Bin 0 -> 167 bytes
 testsuite/gsk/compare/empty-border.node            |    1 +
 testsuite/gsk/compare/empty-border.png             |  Bin 0 -> 169 bytes
 testsuite/gsk/compare/empty-clip.node              |    1 +
 testsuite/gsk/compare/empty-clip.png               |  Bin 0 -> 153 bytes
 testsuite/gsk/compare/empty-color-matrix.node      |    1 +
 testsuite/gsk/compare/empty-color-matrix.png       |  Bin 0 -> 153 bytes
 testsuite/gsk/compare/empty-color.node             |    1 +
 testsuite/gsk/compare/empty-color.png              |  Bin 0 -> 153 bytes
 testsuite/gsk/compare/empty-container.node         |    8 +
 testsuite/gsk/compare/empty-container.png          |  Bin 0 -> 86 bytes
 testsuite/gsk/compare/empty-cross-fade.node        |    9 +
 testsuite/gsk/compare/empty-cross-fade.png         |  Bin 0 -> 105 bytes
 testsuite/gsk/compare/empty-debug.node             |    1 +
 testsuite/gsk/compare/empty-debug.png              |  Bin 0 -> 153 bytes
 testsuite/gsk/compare/empty-inset-shadow.node      |    1 +
 testsuite/gsk/compare/empty-inset-shadow.png       |  Bin 0 -> 164 bytes
 testsuite/gsk/compare/empty-linear-gradient.node   |    1 +
 testsuite/gsk/compare/empty-linear-gradient.png    |  Bin 0 -> 203 bytes
 testsuite/gsk/compare/empty-opacity.node           |    9 +
 testsuite/gsk/compare/empty-opacity.png            |  Bin 0 -> 105 bytes
 testsuite/gsk/compare/empty-outset-shadow.node     |    1 +
 testsuite/gsk/compare/empty-outset-shadow.png      |  Bin 0 -> 168 bytes
 testsuite/gsk/compare/empty-repeat.node            |    1 +
 testsuite/gsk/compare/empty-repeat.png             |  Bin 0 -> 153 bytes
 testsuite/gsk/compare/empty-rounded-clip.node      |    1 +
 testsuite/gsk/compare/empty-rounded-clip.png       |  Bin 0 -> 153 bytes
 testsuite/gsk/compare/empty-shadow.node            |    1 +
 testsuite/gsk/compare/empty-shadow.png             |  Bin 0 -> 181 bytes
 testsuite/gsk/compare/empty-text.node              |    1 +
 testsuite/gsk/compare/empty-text.png               |  Bin 0 -> 405 bytes
 testsuite/gsk/compare/empty-texture.node           |   12 +
 testsuite/gsk/compare/empty-texture.png            |  Bin 0 -> 197 bytes
 testsuite/gsk/compare/empty-transform.node         |    1 +
 testsuite/gsk/compare/empty-transform.png          |  Bin 0 -> 153 bytes
 testsuite/gsk/meson.build                          |  138 +-
 testsuite/gsk/node-parser.c                        |  343 ++++-
 .../blend.node                                     |    0
 testsuite/gsk/nodeparser/blend.ref.node            |   24 +
 .../border.node                                    |    0
 testsuite/gsk/nodeparser/border.ref.node           |    4 +
 .../color.node                                     |    0
 testsuite/gsk/nodeparser/color.ref.node            |    4 +
 testsuite/gsk/nodeparser/crash1.errors             |    3 +
 testsuite/gsk/nodeparser/crash1.ref.node           |    6 +
 testsuite/gsk/nodeparser/crash2.errors             |    3 +
 testsuite/gsk/nodeparser/crash2.ref.node           |   10 +
 testsuite/gsk/nodeparser/crash3.ref.node           |   17 +
 testsuite/gsk/nodeparser/crash4.errors             |    1 +
 testsuite/gsk/nodeparser/crash4.ref.node           |    7 +
 .../debug.node                                     |    3 +-
 testsuite/gsk/nodeparser/empty-blend.node          |    1 +
 testsuite/gsk/nodeparser/empty-blend.ref.node      |   10 +
 testsuite/gsk/nodeparser/empty-blur.node           |    1 +
 testsuite/gsk/nodeparser/empty-blur.ref.node       |    6 +
 testsuite/gsk/nodeparser/empty-border.node         |    1 +
 testsuite/gsk/nodeparser/empty-border.ref.node     |    3 +
 testsuite/gsk/nodeparser/empty-clip.node           |    1 +
 testsuite/gsk/nodeparser/empty-clip.ref.node       |    7 +
 testsuite/gsk/nodeparser/empty-color-matrix.node   |    1 +
 .../gsk/nodeparser/empty-color-matrix.ref.node     |    6 +
 testsuite/gsk/nodeparser/empty-color.node          |    1 +
 testsuite/gsk/nodeparser/empty-color.ref.node      |    4 +
 testsuite/gsk/nodeparser/empty-container.node      |    1 +
 testsuite/gsk/nodeparser/empty-container.ref.node  |    0
 testsuite/gsk/nodeparser/empty-cross-fade.node     |    1 +
 testsuite/gsk/nodeparser/empty-cross-fade.ref.node |   10 +
 testsuite/gsk/nodeparser/empty-debug.node          |    1 +
 testsuite/gsk/nodeparser/empty-debug.ref.node      |    6 +
 testsuite/gsk/nodeparser/empty-inset-shadow.node   |    1 +
 .../gsk/nodeparser/empty-inset-shadow.ref.node     |    3 +
 .../gsk/nodeparser/empty-linear-gradient.node      |    1 +
 .../gsk/nodeparser/empty-linear-gradient.ref.node  |    6 +
 testsuite/gsk/nodeparser/empty-opacity.node        |    1 +
 testsuite/gsk/nodeparser/empty-opacity.ref.node    |    6 +
 testsuite/gsk/nodeparser/empty-outset-shadow.node  |    1 +
 .../gsk/nodeparser/empty-outset-shadow.ref.node    |    3 +
 testsuite/gsk/nodeparser/empty-repeat.node         |    1 +
 testsuite/gsk/nodeparser/empty-repeat.ref.node     |    6 +
 testsuite/gsk/nodeparser/empty-rounded-clip.node   |    1 +
 .../gsk/nodeparser/empty-rounded-clip.ref.node     |    7 +
 testsuite/gsk/nodeparser/empty-shadow.node         |    1 +
 testsuite/gsk/nodeparser/empty-shadow.ref.node     |    7 +
 testsuite/gsk/nodeparser/empty-text.node           |    1 +
 testsuite/gsk/nodeparser/empty-text.ref.node       |    4 +
 testsuite/gsk/nodeparser/empty-texture.node        |    1 +
 testsuite/gsk/nodeparser/empty-texture.ref.node    |    4 +
 testsuite/gsk/nodeparser/empty-transform.node      |    1 +
 testsuite/gsk/nodeparser/empty-transform.ref.node  |    6 +
 .../rounded-rect.node                              |    0
 testsuite/gsk/nodeparser/rounded-rect.ref.node     |   63 +
 .../shadow.node                                    |    0
 testsuite/gsk/nodeparser/shadow.ref.node           |    7 +
 .../testswitch.node                                |  226 ++-
 .../widgetfactory.node                             | 1529 +++++++++-----------
 testsuite/gsk/serialize-deserialize.c              |   58 -
 116 files changed, 2193 insertions(+), 1464 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]