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/dom/node.rs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'components/script/dom/node.rs') diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index d8eee328712..20940788f84 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1344,7 +1344,23 @@ pub trait LayoutNodeHelpers<'dom> { fn children_count(self) -> u32; fn get_style_and_opaque_layout_data(self) -> Option<&'dom StyleAndOpaqueLayoutData>; + + /// Initialize the style and opaque layout data of this node. + /// + /// # Safety + /// + /// This method is unsafe because it modifies the given node during + /// layout. Callers should ensure that no other layout thread is + /// attempting to read or modify the opaque layout data of this node. unsafe fn init_style_and_opaque_layout_data(self, data: Box); + + /// Unset and return the style and opaque layout data of this node. + /// + /// # Safety + /// + /// This method is unsafe because it modifies the given node during + /// layout. Callers should ensure that no other layout thread is + /// attempting to read or modify the opaque layout data of this node. unsafe fn take_style_and_opaque_layout_data(self) -> Box; fn text_content(self) -> Cow<'dom, str>; @@ -1370,9 +1386,8 @@ impl<'dom> LayoutDom<'dom, Node> { impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> { #[inline] - #[allow(unsafe_code)] fn type_id_for_layout(self) -> NodeTypeId { - unsafe { self.unsafe_get().type_id() } + self.unsafe_get().type_id() } #[inline] @@ -1461,9 +1476,8 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> { } #[inline] - #[allow(unsafe_code)] fn children_count(self) -> u32 { - unsafe { self.unsafe_get().children_count.get() } + self.unsafe_get().children_count.get() } // FIXME(nox): How we handle style and layout data needs to be completely -- cgit v1.2.3