11 files changed, 72 insertions, 6 deletions
diff --git a/testsuite/gsk/compare/clip-translate-offscreen.node b/testsuite/gsk/compare/clip-translate-offscreen.node
new file mode 100644
index 0000000000..b5313e3de5
--- /dev/null
+++ b/testsuite/gsk/compare/clip-translate-offscreen.node
@@ -0,0 +1,17 @@
+color {
+  bounds: 0 0 50 50;
+  color: rgb(0,0,0);
+}
+clip {
+  clip: 10 10 30 30;
+  child: transform {
+    transform: translate(10, 10);
+    child: opacity {
+      opacity: 0.8;
+      child: color {
+        bounds: -50 -50 100 100;
+        color: rgb(255,0,0);
+      }
+    }
+  }
+}
diff --git a/testsuite/gsk/compare/clip-translate-offscreen.png b/testsuite/gsk/compare/clip-translate-offscreen.png
new file mode 100644
index 0000000000..9fe22b0b47
--- /dev/null
+++ b/testsuite/gsk/compare/clip-translate-offscreen.png
diff --git a/testsuite/gsk/compare/crossfade-clip-both-children.node b/testsuite/gsk/compare/crossfade-clip-both-children.node
new file mode 100644
index 0000000000..7af2338519
--- /dev/null
+++ b/testsuite/gsk/compare/crossfade-clip-both-children.node
@@ -0,0 +1,18 @@
+color {
+  bounds: 0 0 150 50;
+  color: rgb(0,0,0);
+}
+clip {
+  clip: 50 0 50 50;
+  child: cross-fade {
+    progress: 0.6;
+    start: color {
+      bounds: 0 0 50 50;
+      color: rgb(255,0,0);
+    }
+    end: color {
+      bounds: 100 0 50 50;
+      color: rgb(0,0,255);
+    }
+  }
+}
diff --git a/testsuite/gsk/compare/crossfade-clip-both-children.png b/testsuite/gsk/compare/crossfade-clip-both-children.png
new file mode 100644
index 0000000000..ea47119187
--- /dev/null
+++ b/testsuite/gsk/compare/crossfade-clip-both-children.png
diff --git a/testsuite/gsk/compare/z-transform-clipping-bounds-3d.node b/testsuite/gsk/compare/z-transform-clipping-bounds-3d.node
new file mode 100644
index 0000000000..ebd4b09bd9
--- /dev/null
+++ b/testsuite/gsk/compare/z-transform-clipping-bounds-3d.node
@@ -0,0 +1,28 @@
+transform {
+  transform: translate3d(0, 0, -10000);
+  child: color {
+    bounds: 0 0 50 50;
+    color: rgb(255,0,0);
+  }
+}
+transform {
+  transform: translate3d(0, 0, -10001);
+  child: color {
+    bounds: 50 0 50 50;
+    color: rgb(255,255,0);
+  }
+}
+transform {
+  transform: translate3d(0, 0, 10000);
+  child: color {
+    bounds: 0 50 50 50;
+    color: rgb(0,255,0);
+  }
+}
+transform {
+  transform: translate3d(0, 0, 10001);
+  child: color {
+    bounds: 50 50 50 50;
+    color: rgb(0,0,255);
+  }
+}
diff --git a/testsuite/gsk/compare/z-transform-clipping-bounds-3d.png b/testsuite/gsk/compare/z-transform-clipping-bounds-3d.png
new file mode 100644
index 0000000000..433e3c560f
--- /dev/null
+++ b/testsuite/gsk/compare/z-transform-clipping-bounds-3d.png
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 7ef11174ae..263d13cf29 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -31,9 +31,11 @@ compare_render_tests = [
   'clipped-repeat-3d-ngl',
   'clipped_rounded_clip',
   'clip-nested1',
+  'clip-translate-offscreen',
   'color-blur0',
   'color-matrix-identity',
   'color-matrix-parsing',
+  'crossfade-clip-both-children',
   'cross-fade-in-opacity',
   'cross-fade-in-rotate',
   'css-background',
@@ -88,6 +90,7 @@ compare_render_tests = [
   'texture-url',
   'transform-in-transform',
   'transform-in-transform-in-transform',
+  'z-transform-clipping-bounds-3d',
 ]
 
 # these are too sensitive to differences in the renderers
diff --git a/testsuite/gsk/nodeparser/debug-fail.errors b/testsuite/gsk/nodeparser/debug-fail.errors
index e8b664c7d9..0b8b382c70 100644
--- a/testsuite/gsk/nodeparser/debug-fail.errors
+++ b/testsuite/gsk/nodeparser/debug-fail.errors
@@ -1,2 +1,2 @@
-<data>:5:10-11: error: GTK_CSS_PARSER_WARNING_SYNTAX
-<data>:6:8-9: error: GTK_CSS_PARSER_WARNING_SYNTAX
+<data>:5:3-10: error: GTK_CSS_PARSER_WARNING_SYNTAX
+<data>:6:3-8: error: GTK_CSS_PARSER_WARNING_SYNTAX
diff --git a/testsuite/gsk/nodeparser/gradient-fail.errors b/testsuite/gsk/nodeparser/gradient-fail.errors
index 052224ba76..259b20a3d5 100644
--- a/testsuite/gsk/nodeparser/gradient-fail.errors
+++ b/testsuite/gsk/nodeparser/gradient-fail.errors
@@ -1 +1 @@
-<data>:3:8-9: error: GTK_CSS_PARSER_WARNING_SYNTAX
+<data>:3:3-8: error: GTK_CSS_PARSER_WARNING_SYNTAX
diff --git a/testsuite/gsk/nodeparser/shadow-fail.errors b/testsuite/gsk/nodeparser/shadow-fail.errors
index bb77a372fc..d6984612c1 100644
--- a/testsuite/gsk/nodeparser/shadow-fail.errors
+++ b/testsuite/gsk/nodeparser/shadow-fail.errors
@@ -2,7 +2,7 @@
 <data>:2:11-13: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
 <data>:2:13-14: error: GTK_CSS_PARSER_ERROR_SYNTAX
 <data>:2:13-14: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
-<data>:3:9-10: error: GTK_CSS_PARSER_WARNING_SYNTAX
+<data>:3:2-9: error: GTK_CSS_PARSER_WARNING_SYNTAX
 <data>:3:11-13: error: GTK_CSS_PARSER_ERROR_SYNTAX
 <data>:3:11-13: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE
 <data>:3:13-14: error: GTK_CSS_PARSER_ERROR_SYNTAX
diff --git a/testsuite/gsk/nodeparser/text-fail.errors b/testsuite/gsk/nodeparser/text-fail.errors
index 1df16b5cff..612c1ad4b5 100644
--- a/testsuite/gsk/nodeparser/text-fail.errors
+++ b/testsuite/gsk/nodeparser/text-fail.errors
@@ -1,3 +1,3 @@
-<data>:4:7-8: error: GTK_CSS_PARSER_WARNING_SYNTAX
-<data>:6:9-10: error: GTK_CSS_PARSER_WARNING_SYNTAX
+<data>:4:3-7: error: GTK_CSS_PARSER_WARNING_SYNTAX
+<data>:6:3-9: error: GTK_CSS_PARSER_WARNING_SYNTAX
 <data>:8:1-2: error: GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE