From 71851c251f175ee051d4940eb345d66d004f399d Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Thu, 12 Nov 2026 07:51:40 -0800
Subject: [PATCH] Render tests: the kept-tile decode-failure test passes while
 other tests add fonts

pattern::tests::kept_tiles_count_the_images_they_could_not_decode
draws a pattern whose art is an image three times and expects one tile
to be rasterized. A tile of art with an image is kept only while
FontDb::global().generation() is the one it was drawn at (Deps::current
in pattern.rs). The render tests that hold adding_fonts() add fonts,
which increases it (tests/fontchange.rs, tests/typeedges.rs,
tests/alternate.rs, tests/colrglyphs.rs and tests/bitmapglyphs.rs).
When one of them added a font between the frames, the next frame drew
the tile again and the test failed with left 2 or 3, right 1. Run with
the tests in tests/fontchange.rs and tests/typeedges.rs, it failed in
23 of 30 runs on main.

The test now holds fonts_steady() and takes its counts from
with_fonts_unchanged(), as the other render tests that count kept work
do. Each run builds a new document, so its first frame does not find a
tile from an earlier run. Run with the same tests, it passed in all 30
runs.
---
 crates/render/src/pattern/tests.rs | 35 ++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/crates/render/src/pattern/tests.rs b/crates/render/src/pattern/tests.rs
index 76aad7fe6f..701afe9b41 100644
--- a/crates/render/src/pattern/tests.rs
+++ b/crates/render/src/pattern/tests.rs
@@ -251,19 +251,30 @@ fn kept_tiles_stay_within_the_budget() {
 #[test]
 fn kept_tiles_count_the_images_they_could_not_decode() {
     use vectorcraft_doc::{ImageBlob, ImageObject};
-    let mut d = doc_with_pattern(TileType::Grid);
-    // A PNG signature with nothing after it.
-    d.images.insert("cut".into(), ImageBlob::new("image/png", b"\x89PNG\r\n\x1a\n".to_vec()));
-    let im = ImageObject { key: "cut".into(), width: 10, height: 10, xf: Affine::IDENTITY, link: None, placement: Default::default(), pixels: None };
-    d.patterns[0].art = vec![Arc::new(Node::new(NodeId(901), NodeKind::Image(Box::new(im))))];
-    let mut r = Renderer::new();
-    let start = tiles_rasterized();
-    for n in 0..3 {
-        let before = crate::paint::decode_failures();
-        frame(&mut r, &d, 1.0);
-        assert!(crate::paint::decode_failures() > before, "frame {n}");
+    // A tile of art with an image is drawn again when the fonts change, and other tests add
+    // fonts, so the frames come from a run in which the fonts stayed the same. Each run draws a
+    // new document, whose first frame finds no tile kept from an earlier run.
+    let _fonts = crate::tests_fontchange::fonts_steady();
+    let (failures, rasterized) = crate::tests_fontchange::with_fonts_unchanged(|| {
+        let mut d = doc_with_pattern(TileType::Grid);
+        // A PNG signature with nothing after it.
+        d.images.insert("cut".into(), ImageBlob::new("image/png", b"\x89PNG\r\n\x1a\n".to_vec()));
+        let im =
+            ImageObject { key: "cut".into(), width: 10, height: 10, xf: Affine::IDENTITY, link: None, placement: Default::default(), pixels: None };
+        d.patterns[0].art = vec![Arc::new(Node::new(NodeId(901), NodeKind::Image(Box::new(im))))];
+        let mut r = Renderer::new();
+        let start = tiles_rasterized();
+        let failures = [0, 1, 2].map(|_| {
+            let before = crate::paint::decode_failures();
+            frame(&mut r, &d, 1.0);
+            crate::paint::decode_failures() > before
+        });
+        (failures, tiles_rasterized() - start)
+    });
+    for (n, failed) in failures.into_iter().enumerate() {
+        assert!(failed, "frame {n}");
     }
-    assert_eq!(tiles_rasterized() - start, 1, "the later frames draw from the tile kept");
+    assert_eq!(rasterized, 1, "the later frames draw from the tile kept");
 }
 
 #[test]