Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more view tracking (#24683)

Browse source 
This should fix a panic in `Window::current_view()`

Release Notes:

- N/A
This commit is contained in:
Mikayla Maki 2025-02-11 11:18:54 -08:00 • committed by GitHub
parent 0a146793ea
commit 477cec0ef1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 97 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

173
crates/gpui/src/view.rs
View file

@ -40,7 +40,9 @@ impl<V: Render> Element for Entity<V> {
cx: &mut App, cx: &mut App,
) -> (LayoutId, Self::RequestLayoutState) { ) -> (LayoutId, Self::RequestLayoutState) {
let mut element = self.update(cx, |view, cx| view.render(window, cx).into_any_element()); let mut element = self.update(cx, |view, cx| view.render(window, cx).into_any_element());
let layout_id = element.request_layout(window, cx); let layout_id = window.with_rendered_view(self.entity_id(), |window| {
element.request_layout(window, cx)
});
(layout_id, element) (layout_id, element)
} }
@ -53,7 +55,7 @@ impl<V: Render> Element for Entity<V> {
cx: &mut App, cx: &mut App,
) { ) {
window.set_view_id(self.entity_id()); window.set_view_id(self.entity_id());
element.prepaint(window, cx); window.with_rendered_view(self.entity_id(), |window| element.prepaint(window, cx));
} }
fn paint( fn paint(
@ -65,7 +67,7 @@ impl<V: Render> Element for Entity<V> {
window: &mut Window, window: &mut Window,
cx: &mut App, cx: &mut App,
) { ) {
element.paint(window, cx); window.with_rendered_view(self.entity_id(), |window| element.paint(window, cx));
} }
} }
@ -150,18 +152,18 @@ impl Element for AnyView {
window: &mut Window, window: &mut Window,
cx: &mut App, cx: &mut App,
) -> (LayoutId, Self::RequestLayoutState) { ) -> (LayoutId, Self::RequestLayoutState) {
if let Some(style) = self.cached_style.as_ref() { window.with_rendered_view(self.entity_id(), |window| {
let mut root_style = Style::default(); if let Some(style) = self.cached_style.as_ref() {
root_style.refine(style); let mut root_style = Style::default();
let layout_id = window.request_layout(root_style, None, cx); root_style.refine(style);
(layout_id, None) let layout_id = window.request_layout(root_style, None, cx);
} else { (layout_id, None)
window.with_rendered_view(self.entity_id(), |window| { } else {
let mut element = (self.render)(self, window, cx); let mut element = (self.render)(self, window, cx);
let layout_id = element.request_layout(window, cx); let layout_id = element.request_layout(window, cx);
(layout_id, Some(element)) (layout_id, Some(element))
}) }
} })
} }
fn prepaint( fn prepaint(
@ -173,69 +175,66 @@ impl Element for AnyView {
cx: &mut App, cx: &mut App,
) -> Option<AnyElement> { ) -> Option<AnyElement> {
window.set_view_id(self.entity_id()); window.set_view_id(self.entity_id());
if self.cached_style.is_some() { window.with_rendered_view(self.entity_id(), |window| {
window.with_element_state::<AnyViewState, _>( if self.cached_style.is_some() {
global_id.unwrap(), window.with_element_state::<AnyViewState, _>(
|element_state, window| { global_id.unwrap(),
let content_mask = window.content_mask(); |element_state, window| {
let text_style = window.text_style(); let content_mask = window.content_mask();
let text_style = window.text_style();
if let Some(mut element_state) = element_state { if let Some(mut element_state) = element_state {
if element_state.cache_key.bounds == bounds if element_state.cache_key.bounds == bounds
&& element_state.cache_key.content_mask == content_mask && element_state.cache_key.content_mask == content_mask
&& element_state.cache_key.text_style == text_style && element_state.cache_key.text_style == text_style
&& !window.dirty_views.contains(&self.entity_id()) && !window.dirty_views.contains(&self.entity_id())
&& !window.refreshing && !window.refreshing
{ {
let prepaint_start = window.prepaint_index(); let prepaint_start = window.prepaint_index();
window.reuse_prepaint(element_state.prepaint_range.clone()); window.reuse_prepaint(element_state.prepaint_range.clone());
cx.entities cx.entities
.extend_accessed(&element_state.accessed_entities); .extend_accessed(&element_state.accessed_entities);
let prepaint_end = window.prepaint_index(); let prepaint_end = window.prepaint_index();
element_state.prepaint_range = prepaint_start..prepaint_end; element_state.prepaint_range = prepaint_start..prepaint_end;
return (None, element_state); return (None, element_state);
}
} }
}
let refreshing = mem::replace(&mut window.refreshing, true); let refreshing = mem::replace(&mut window.refreshing, true);
let prepaint_start = window.prepaint_index(); let prepaint_start = window.prepaint_index();
let (mut element, accessed_entities) = let (mut element, accessed_entities) = cx.detect_accessed_entities(|cx| {
window.with_rendered_view(self.entity_id(), |window| { let mut element = (self.render)(self, window, cx);
cx.detect_accessed_entities(|cx| { element.layout_as_root(bounds.size.into(), window, cx);
let mut element = (self.render)(self, window, cx); element.prepaint_at(bounds.origin, window, cx);
element.layout_as_root(bounds.size.into(), window, cx); element
element.prepaint_at(bounds.origin, window, cx);
element
})
}); });
let prepaint_end = window.prepaint_index(); let prepaint_end = window.prepaint_index();
window.refreshing = refreshing; window.refreshing = refreshing;
( (
Some(element), Some(element),
AnyViewState { AnyViewState {
accessed_entities, accessed_entities,
prepaint_range: prepaint_start..prepaint_end, prepaint_range: prepaint_start..prepaint_end,
paint_range: PaintIndex::default()..PaintIndex::default(), paint_range: PaintIndex::default()..PaintIndex::default(),
cache_key: ViewCacheKey { cache_key: ViewCacheKey {
bounds, bounds,
content_mask, content_mask,
text_style, text_style,
},
}, },
}, )
) },
}, )
) } else {
} else { let mut element = element.take().unwrap();
let mut element = element.take().unwrap();
window.with_rendered_view(self.entity_id(), |window| {
element.prepaint(window, cx); element.prepaint(window, cx);
});
Some(element) Some(element)
} }
})
} }
fn paint( fn paint(
@ -247,33 +246,33 @@ impl Element for AnyView {
window: &mut Window, window: &mut Window,
cx: &mut App, cx: &mut App,
) { ) {
if self.cached_style.is_some() { window.with_rendered_view(self.entity_id(), |window| {
window.with_element_state::<AnyViewState, _>( if self.cached_style.is_some() {
global_id.unwrap(), window.with_element_state::<AnyViewState, _>(
|element_state, window| { global_id.unwrap(),
let mut element_state = element_state.unwrap(); |element_state, window| {
let mut element_state = element_state.unwrap();
let paint_start = window.paint_index(); let paint_start = window.paint_index();
if let Some(element) = element { if let Some(element) = element {
let refreshing = mem::replace(&mut window.refreshing, true); let refreshing = mem::replace(&mut window.refreshing, true);
window.with_rendered_view(self.entity_id(), |window| {
element.paint(window, cx); element.paint(window, cx);
}); window.refreshing = refreshing;
window.refreshing = refreshing; } else {
} else { window.reuse_paint(element_state.paint_range.clone());
window.reuse_paint(element_state.paint_range.clone()); }
}
let paint_end = window.paint_index(); let paint_end = window.paint_index();
element_state.paint_range = paint_start..paint_end; element_state.paint_range = paint_start..paint_end;
((), element_state) ((), element_state)
}, },
) )
} else { } else {
element.as_mut().unwrap().paint(window, cx); element.as_mut().unwrap().paint(window, cx);
} }
});
} }
} }

15
crates/gpui/src/window.rs
View file

@ -477,6 +477,7 @@ pub(crate) struct TooltipRequest {
} }
pub(crate) struct DeferredDraw { pub(crate) struct DeferredDraw {
current_view: EntityId,
priority: usize, priority: usize,
parent_node: DispatchNodeId, parent_node: DispatchNodeId,
element_id_stack: SmallVec<[ElementId; 32]>, element_id_stack: SmallVec<[ElementId; 32]>,
@ -1750,9 +1751,11 @@ impl Window {
let prepaint_start = self.prepaint_index(); let prepaint_start = self.prepaint_index();
if let Some(element) = deferred_draw.element.as_mut() { if let Some(element) = deferred_draw.element.as_mut() {
self.with_absolute_element_offset(deferred_draw.absolute_offset, |window| { self.with_rendered_view(deferred_draw.current_view, |window| {
element.prepaint(window, cx) window.with_absolute_element_offset(deferred_draw.absolute_offset, |window| {
}); element.prepaint(window, cx)
});
})
} else { } else {
self.reuse_prepaint(deferred_draw.prepaint_range.clone()); self.reuse_prepaint(deferred_draw.prepaint_range.clone());
} }
@ -1783,7 +1786,9 @@ impl Window {
let paint_start = self.paint_index(); let paint_start = self.paint_index();
if let Some(element) = deferred_draw.element.as_mut() { if let Some(element) = deferred_draw.element.as_mut() {
element.paint(self, cx); self.with_rendered_view(deferred_draw.current_view, |window| {
element.paint(window, cx);
})
} else { } else {
self.reuse_paint(deferred_draw.paint_range.clone()); self.reuse_paint(deferred_draw.paint_range.clone());
} }
@ -1841,6 +1846,7 @@ impl Window {
[range.start.deferred_draws_index..range.end.deferred_draws_index] [range.start.deferred_draws_index..range.end.deferred_draws_index]
.iter() .iter()
.map(|deferred_draw| DeferredDraw { .map(|deferred_draw| DeferredDraw {
current_view: deferred_draw.current_view,
parent_node: reused_subtree.refresh_node_id(deferred_draw.parent_node), parent_node: reused_subtree.refresh_node_id(deferred_draw.parent_node),
element_id_stack: deferred_draw.element_id_stack.clone(), element_id_stack: deferred_draw.element_id_stack.clone(),
text_style_stack: deferred_draw.text_style_stack.clone(), text_style_stack: deferred_draw.text_style_stack.clone(),
@ -2247,6 +2253,7 @@ impl Window {
self.invalidator.debug_assert_prepaint(); self.invalidator.debug_assert_prepaint();
let parent_node = self.next_frame.dispatch_tree.active_node_id().unwrap(); let parent_node = self.next_frame.dispatch_tree.active_node_id().unwrap();
self.next_frame.deferred_draws.push(DeferredDraw { self.next_frame.deferred_draws.push(DeferredDraw {
current_view: self.current_view(),
parent_node, parent_node,
element_id_stack: self.element_id_stack.clone(), element_id_stack: self.element_id_stack.clone(),
text_style_stack: self.text_style_stack.clone(), text_style_stack: self.text_style_stack.clone(),