From dadc6a8d5f29a5445fc39dbf7b175d42e667d46c Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Tue, 3 Nov 2026 14:02:36 +0100 Subject: [PATCH] Viewport pages: fall back when an edited page fails to render stuck() only counted a failed page as a hole when no page was held, so a dirty (edited) page whose new render failed kept drawing its pre-edit content until a retry. Treat a held dirty page like a missing one. Addresses CodeRabbit review r4453118133 on #5332. --- crates/ui-egui/src/canvas/viewport_pages.rs | 23 ++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/src/canvas/viewport_pages.rs b/crates/ui-egui/src/canvas/viewport_pages.rs index 72483f9c0e..01c7d791cf 100644 --- a/crates/ui-egui/src/canvas/viewport_pages.rs +++ b/crates/ui-egui/src/canvas/viewport_pages.rs @@ -396,10 +396,11 @@ impl Stream { } } - /// Whether a wanted page can't be shown: its render or upload failed and nothing older of it - /// is held, so the view would have a hole (the CPU canvas draws instead). + /// Whether a wanted page can't be shown: its render or upload failed and nothing current of + /// it is held, so the view would have a hole, or keep showing the page from before an edit + /// (the CPU canvas draws instead). pub fn stuck(&self, wanted: &[PageId]) -> bool { - wanted.iter().any(|p| !self.pages.contains_key(p) && self.failed.contains(&(*p, self.epoch(*p)))) + wanted.iter().any(|p| self.pages.get(p).is_none_or(|q| q.dirty) && self.failed.contains(&(*p, self.epoch(*p)))) } /// Whether work is outstanding (the view repaints until it is done). @@ -926,6 +927,22 @@ mod tests { assert!(!s.stuck(&view)); } + /// An edited page whose new render fails isn't left showing its old content (#5332 review). + #[test] + fn a_dirty_page_whose_render_failed_falls_back() { + let view = [page(1, 0, 0)]; + let mut s = holding(&view); + s.invalidate(id(2), None); + assert!(s.pages[&view[0]].dirty && !s.stuck(&view), "the old page shows while it renders"); + let mut log = Vec::new(); + s.update(&view, true, recorder(&mut log)); + s.tx.send(Done { page: view[0], epoch: log[0].1, exact: true, region: None, result: Err("out of memory".into()) }).unwrap(); + s.update(&view, true, |_, _, _, _, _| panic!("no retry while failed")); + assert!(s.stuck(&view), "a stale page is not drawn in place of the failed one"); + s.retry_after((7, 7)); + assert!(!s.stuck(&view)); + } + #[test] fn prune_drops_finer_and_dirty_pages_once_the_view_is_current() { let (fine, coarse, view) = (page(1, 0, 0), page(4, 0, 0), page(2, 0, 0));