aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/document.rs
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2024-04-03 10:41:19 +0200
committerGitHub <noreply@github.com>2024-04-03 08:41:19 +0000
commit18b37e676bcd50f754cd189444080fc547c9d48a (patch)
treeca2e235d13b6f9b19cff9172810b0c6f08265f3b /components/script/dom/document.rs
parent8aaff613342568c13e9141758b770788694d2f84 (diff)
downloadservo-18b37e676bcd50f754cd189444080fc547c9d48a.tar.gz
servo-18b37e676bcd50f754cd189444080fc547c9d48a.zip
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.
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r--components/script/dom/document.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index d427fbcf631..dd16ae22ae0 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -2934,40 +2934,40 @@ pub enum DocumentSource {
#[allow(unsafe_code)]
pub trait LayoutDocumentHelpers<'dom> {
fn is_html_document_for_layout(self) -> bool;
- unsafe fn needs_paint_from_layout(self);
- unsafe fn will_paint(self);
+ fn needs_paint_from_layout(self);
+ fn will_paint(self);
fn quirks_mode(self) -> QuirksMode;
fn style_shared_lock(self) -> &'dom StyleSharedRwLock;
fn shadow_roots(self) -> Vec<LayoutDom<'dom, ShadowRoot>>;
fn shadow_roots_styles_changed(self) -> bool;
- unsafe fn flush_shadow_roots_stylesheets(self);
+ fn flush_shadow_roots_stylesheets(self);
}
#[allow(unsafe_code)]
impl<'dom> LayoutDocumentHelpers<'dom> for LayoutDom<'dom, Document> {
#[inline]
fn is_html_document_for_layout(self) -> bool {
- unsafe { self.unsafe_get().is_html_document }
+ self.unsafe_get().is_html_document
}
#[inline]
- unsafe fn needs_paint_from_layout(self) {
+ fn needs_paint_from_layout(self) {
(self.unsafe_get()).needs_paint.set(true)
}
#[inline]
- unsafe fn will_paint(self) {
+ fn will_paint(self) {
(self.unsafe_get()).needs_paint.set(false)
}
#[inline]
fn quirks_mode(self) -> QuirksMode {
- unsafe { self.unsafe_get().quirks_mode.get() }
+ self.unsafe_get().quirks_mode.get()
}
#[inline]
fn style_shared_lock(self) -> &'dom StyleSharedRwLock {
- unsafe { self.unsafe_get().style_shared_lock() }
+ self.unsafe_get().style_shared_lock()
}
#[inline]
@@ -2988,11 +2988,11 @@ impl<'dom> LayoutDocumentHelpers<'dom> for LayoutDom<'dom, Document> {
#[inline]
fn shadow_roots_styles_changed(self) -> bool {
- unsafe { self.unsafe_get().shadow_roots_styles_changed.get() }
+ self.unsafe_get().shadow_roots_styles_changed.get()
}
#[inline]
- unsafe fn flush_shadow_roots_stylesheets(self) {
+ fn flush_shadow_roots_stylesheets(self) {
(*self.unsafe_get()).flush_shadow_roots_stylesheets()
}
}