[gtk: 13/13] Merge branch 'wip/otte/for-master' into 'master'
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 13/13] Merge branch 'wip/otte/for-master' into 'master'
- Date: Sun, 12 May 2019 16:28:10 +0000 (UTC)
commit f8c1f7173adda4170b87f9988e70fa628ef9caf5
Merge: e0e9d8c6b5 a04ea72ca1
Author: Benjamin Otte <otte benjamin googlemail com>
Date: Sun May 12 16:27:47 2019 +0000
Merge branch 'wip/otte/for-master' into 'master'
Wip/otte/for master
See merge request GNOME/gtk!832
demos/node-editor/node-editor-window.c | 32 ++-
gsk/gskrendernodeimpl.c | 6 +-
gsk/gskrendernodeparser.c | 250 +++++++++---------
gtk/css/gtkcssdataurl.c | 175 +++++++++++++
gtk/css/gtkcssdataurlprivate.h | 35 +++
gtk/css/gtkcssparser.c | 28 +-
gtk/css/gtkcssparserprivate.h | 2 +-
gtk/css/meson.build | 1 +
gtk/gtkcssimagerecolor.c | 14 +-
gtk/gtkcssimageurl.c | 48 +++-
gtk/gtkcssprovider.c | 9 +-
gtk/gtktestutils.c | 1 -
testsuite/a11y/misc.c | 4 +-
testsuite/a11y/text.c | 4 +-
testsuite/a11y/value.c | 2 -
testsuite/css/data.c | 100 ++++++++
testsuite/css/meson.build | 16 ++
testsuite/gdk/memorytexture.c | 2 -
testsuite/gdk/rectangle.c | 2 -
testsuite/gdk/rgba.c | 16 +-
testsuite/gdk/seat.c | 2 -
testsuite/gsk/compare-render.c | 3 +-
testsuite/gsk/compare/texture-url.node | 11 +
testsuite/gsk/compare/texture-url.png | Bin 0 -> 179 bytes
testsuite/gsk/meson.build | 7 +-
.../gsk/serializedeserialize/widgetfactory.node | 282 ++++++++-------------
testsuite/gtk/bitmask.c | 1 -
testsuite/gtk/cellarea.c | 1 -
testsuite/gtk/filterlistmodel.c | 1 -
testsuite/gtk/filtermodel.c | 14 +-
testsuite/gtk/flattenlistmodel.c | 1 -
testsuite/gtk/main.c | 1 -
testsuite/gtk/maplistmodel.c | 1 -
testsuite/gtk/no-gtk-init.c | 1 -
testsuite/gtk/rbtree-crash.c | 1 -
testsuite/gtk/rbtree.c | 1 -
testsuite/gtk/singleselection.c | 1 -
testsuite/gtk/slicelistmodel.c | 1 -
testsuite/gtk/sortlistmodel.c | 1 -
testsuite/gtk/sortmodel.c | 8 +-
testsuite/gtk/treelistmodel.c | 1 -
testsuite/gtk/treemodel.c | 2 -
testsuite/gtk/treestore.c | 4 +-
testsuite/gtk/treeview.c | 9 +-
testsuite/gtk/window.c | 3 +-
testsuite/reftests/data-url.css | 3 +
testsuite/reftests/data-url.ref.ui | 12 +
testsuite/reftests/data-url.ui | 8 +
testsuite/reftests/meson.build | 3 +
49 files changed, 739 insertions(+), 392 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]