diff options
| author | Alexander Larsson <alexl@redhat.com> | 2020-06-04 12:37:48 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2020-06-04 14:22:27 +0200 |
| commit | b4af23be23f04c02c9ce633c033fc145349ca45b (patch) | |
| tree | 77460f543db9b7bb878bb02a64ab0a8850527341 /testsuite/reftests | |
| parent | 36314c3ff7c803d950e9147b9efe471c0c702b1a (diff) | |
| download | gtk+-b4af23be23f04c02c9ce633c033fc145349ca45b.tar.gz | |
snapshot: Fix assert in inhibition
In https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2027 i was getting
Bail out! ERROR:../testsuite/reftests/reftest-snapshot.c:212:reftest_uninhibit_snapshot: assertion failed: (inhibit_count > 0)
In (for example the box-shadow-changes-modify-clip reftest. I can reproduce this (on master) with:
```
$ xvfb-run -a -s "-screen 0 1024x768x24" meson test --suite gtk:reftest "reftest box-shadow-changes-modify-clip.ui"
...
1/1 gtk:reftest / reftest box-shadow-changes-modify-clip.ui ERROR 0.77s
``
Fix this by re-inhibiting if we didn't draw anything, or we will get an assert the next paint.
Diffstat (limited to 'testsuite/reftests')
| -rw-r--r-- | testsuite/reftests/reftest-snapshot.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/testsuite/reftests/reftest-snapshot.c b/testsuite/reftests/reftest-snapshot.c index 5ea2262fe5..2d870f66e4 100644 --- a/testsuite/reftests/reftest-snapshot.c +++ b/testsuite/reftests/reftest-snapshot.c @@ -231,7 +231,10 @@ draw_paintable (GdkPaintable *paintable, cairo_t *cr; if (!reftest_uninhibit_snapshot ()) - return; + { + reftest_inhibit_snapshot(); + return; + } snapshot = gtk_snapshot_new (); gdk_paintable_snapshot (paintable, @@ -244,7 +247,10 @@ draw_paintable (GdkPaintable *paintable, * the invalidations were only side effects of resizes. */ if (node == NULL) - return; + { + reftest_inhibit_snapshot(); + return; + } surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, gdk_paintable_get_intrinsic_width (paintable), |