Merge branch 'matthiasc/for-master' into 'master'

testsuite: Sort gsk compare tests

See merge request GNOME/gtk!3389

testsuite/gsk/compare/borders-scaled.node

@@ -0,0 +1,13 @@
+transform {
+  child: container {
+    border {
+      outline: 5 5 50 50;
+    }
+    color {
+      color: rgba(0, 0, 0, 0);
+      bounds: 0 0 110 110;
+    }
+  }
+
+  transform: translate(110, 0) scale(3,3);
+}

testsuite/gsk/compare/css-background.node

@@ -0,0 +1,61 @@
+transform {
+  transform: scale(16,16);
+  child: container {
+
+    clip {
+      clip: 0 0 30 30;
+      child: container {
+        rounded-clip {
+          clip: 5 5 50 50 / 5;
+          child: color {
+            color: rgba(255, 0, 0, 255);
+            bounds: 5 5 50 50;
+          }
+        }
+        border {
+          outline: 5  5 50 50 / 5;
+          widths: 3;
+          colors: yellow;
+        }
+      }
+    }
+
+    debug {
+      message: "Clipped-out area";
+      child: container {
+
+        color {
+          color: black;
+          bounds: 7 5 5 1;
+        }
+
+        color {
+          color: black;
+          bounds: 6 6 2 1;
+        }
+
+        color {
+          color: black;
+          bounds: 5 7 2 1;
+        }
+
+        color {
+          color: black;
+          bounds: 5 8 1 3;
+        }
+
+        color {
+          color: black;
+          bounds: 8 8 1 3;
+        }
+
+        color {
+          color: black;
+          bounds: 8 8 3 1;
+        }
+      }
+    }
+  }
+}
+
+

testsuite/gsk/meson.build

@@ -20,14 +20,23 @@ node_parser = executable(
 )
 
 compare_render_tests = [
-  'blend-normal',
   'blend-difference',
+  'blend-invisible-child',
+  'blend-normal',
+  'borders-rotated',
+  'borders-scaled',
   'clip-coordinates-2d',
   'clip-coordinates-3d',
+  'clip-in-rounded-clip1',
+  'clip-in-rounded-clip2',
+  'clip-in-rounded-clip3',
+  'clipped-repeat-3d-ngl',
   'clipped_rounded_clip',
+  'clip-nested1',
   'color-blur0',
   'color-matrix-identity',
   'cross-fade-in-opacity',
+  'css-background',
   'empty-blend',
   'empty-blur',
   'empty-border',
@@ -48,36 +57,28 @@ compare_render_tests = [
   'empty-shadow',
   'empty-texture',
   'empty-transform',
+  'inset-shadow-multiple',
   'invalid-transform',
+  'issue-3615',
+  'nested-rounded-clips',
   'opacity_clip',
+  'opacity-overlapping-children',
   'outset_shadow_offset_both',
   'outset_shadow_offset_x',
   'outset_shadow_offset_y',
   'outset_shadow_rounded_top',
   'outset_shadow_simple',
   'scaled-cairo',
+  'scale-up-down',
   'shadow-in-opacity',
   'texture-url',
-  'color-matrix-identity',
-  'clip-nested1',
-  'scale-up-down',
-  'opacity-overlapping-children',
   'repeat',
-  'repeat-texture',
   'repeat-no-repeat',
   'repeat-negative-coords',
-  'inset-shadow-multiple',
-  'borders-rotated',
-  'blend-invisible-child',
+  'repeat-texture',
   'transform-in-transform',
   'transform-in-transform-in-transform',
-  'nested-rounded-clips',
-  'clip-in-rounded-clip1',
-  'clip-in-rounded-clip2',
-  'clip-in-rounded-clip3',
   'rounded-clip-in-clip-3d', # not really 3d, but cairo fails it
-  'clipped-repeat-3d-ngl',
-  'issue-3615'
 ]
 
 # these are too sensitive to differences in the renderers