From 18b37e676bcd50f754cd189444080fc547c9d48a Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Wed, 3 Apr 2024 10:41:19 +0200 Subject: script: Reduce the use of `unsafe` in LayoutDom (#31979) Remove the use of unsafe code in the layout wrappers of the DOM. The main change here is that `unsafe_get()` no longer needs to be an unsafe method, which allows us to transitively remove or reduce unsafe blocks from callers. The function itself is not renamed, because it's still a bit dangerous to start removing the layers of abstraction from actual DOM nodes. In addition `init_style_and_opaque_layout_data` can be merged into `initialize_data`, which removes one more unsafe method. Finally, a "Safety" section is added to some unsafe methods. --- components/script/layout_dom/node.rs | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'components/script/layout_dom/node.rs') diff --git a/components/script/layout_dom/node.rs b/components/script/layout_dom/node.rs index c331f4aa5e3..cd5b1780cfa 100644 --- a/components/script/layout_dom/node.rs +++ b/components/script/layout_dom/node.rs @@ -207,21 +207,17 @@ impl<'dom, LayoutDataType: LayoutDataTrait> LayoutNode<'dom> } unsafe fn initialize_data(&self) { - if self.get_style_and_opaque_layout_data().is_none() { - let opaque = StyleAndOpaqueLayoutData::new( - StyleData::default(), - AtomicRefCell::new(LayoutDataType::default()), - ); - self.init_style_and_opaque_layout_data(opaque); - }; - } + if self.get_style_and_opaque_layout_data().is_some() { + return; + } - unsafe fn init_style_and_opaque_layout_data(&self, data: Box) { - self.get_jsmanaged().init_style_and_opaque_layout_data(data); - } + let opaque = StyleAndOpaqueLayoutData::new( + StyleData::default(), + AtomicRefCell::new(LayoutDataType::default()), + ); - unsafe fn take_style_and_opaque_layout_data(&self) -> Box { - self.get_jsmanaged().take_style_and_opaque_layout_data() + self.get_jsmanaged() + .init_style_and_opaque_layout_data(opaque); } fn is_connected(&self) -> bool { @@ -402,7 +398,7 @@ impl<'dom, LayoutDataType: LayoutDataTrait> ThreadSafeLayoutNode<'dom> } } - unsafe fn unsafe_get(self) -> Self::ConcreteNode { + fn unsafe_get(self) -> Self::ConcreteNode { self.node } -- cgit v1.2.3