Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Reduce the use of unsafe in LayoutDom (#31979)

Browse source 
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.
This commit is contained in:
Martin Robinson 2024-04-03 10:41:19 +02:00 • committed by GitHub
parent 8aaff61334
commit 18b37e676b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 89 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/script/layout_dom/node.rs
View file

@ -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<StyleAndOpaqueLayoutData>) {
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<StyleAndOpaqueLayoutData> {
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
}