diff --git a/components/layout_thread/dom_wrapper.rs b/components/layout_thread/dom_wrapper.rs index 4359f623acc8..2528a4742114 100644 --- a/components/layout_thread/dom_wrapper.rs +++ b/components/layout_thread/dom_wrapper.rs @@ -443,7 +443,7 @@ impl<'le> TElement for ServoLayoutElement<'le> { } fn is_html_element(&self) -> bool { - unsafe { self.element.is_html_element() } + self.element.is_html_element() } fn is_mathml_element(&self) -> bool { @@ -954,14 +954,12 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> { } fn is_html_slot_element(&self) -> bool { - unsafe { self.element.is_html_element() && self.local_name() == &local_name!("slot") } + self.element.is_html_element() && self.local_name() == &local_name!("slot") } fn is_html_element_in_html_document(&self) -> bool { - unsafe { - if !self.element.is_html_element() { - return false; - } + if !self.element.is_html_element() { + return false; } self.as_node().owner_doc().is_html_document() diff --git a/components/layout_thread_2020/dom_wrapper.rs b/components/layout_thread_2020/dom_wrapper.rs index c113a1bc49a7..dea364d1723a 100644 --- a/components/layout_thread_2020/dom_wrapper.rs +++ b/components/layout_thread_2020/dom_wrapper.rs @@ -450,7 +450,7 @@ impl<'le> TElement for ServoLayoutElement<'le> { } fn is_html_element(&self) -> bool { - unsafe { self.element.is_html_element() } + self.element.is_html_element() } fn is_mathml_element(&self) -> bool { @@ -961,14 +961,12 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> { } fn is_html_slot_element(&self) -> bool { - unsafe { self.element.is_html_element() && self.local_name() == &local_name!("slot") } + self.element.is_html_element() && self.local_name() == &local_name!("slot") } fn is_html_element_in_html_document(&self) -> bool { - unsafe { - if !self.element.is_html_element() { - return false; - } + if !self.element.is_html_element() { + return false; } self.as_node().owner_doc().is_html_document() diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 8eee9a644906..446fffea01a7 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -571,12 +571,9 @@ pub trait LayoutElementHelpers<'dom> { unsafe fn synthesize_presentational_hints_for_legacy_attributes(self, _: &mut V) where V: Push; - #[allow(unsafe_code)] - unsafe fn get_colspan(self) -> u32; - #[allow(unsafe_code)] - unsafe fn get_rowspan(self) -> u32; - #[allow(unsafe_code)] - unsafe fn is_html_element(self) -> bool; + fn get_colspan(self) -> u32; + fn get_rowspan(self) -> u32; + fn is_html_element(self) -> bool; fn id_attribute(self) -> *const Option; fn style_attribute(self) -> *const Option>>; fn local_name(self) -> &'dom LocalName; @@ -951,8 +948,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { } } - #[allow(unsafe_code)] - unsafe fn get_colspan(self) -> u32 { + fn get_colspan(self) -> u32 { if let Some(this) = self.downcast::() { this.get_colspan().unwrap_or(1) } else { @@ -962,8 +958,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { } } - #[allow(unsafe_code)] - unsafe fn get_rowspan(self) -> u32 { + fn get_rowspan(self) -> u32 { if let Some(this) = self.downcast::() { this.get_rowspan().unwrap_or(1) } else { @@ -974,9 +969,8 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { } #[inline] - #[allow(unsafe_code)] - unsafe fn is_html_element(self) -> bool { - (*self.unsafe_get()).namespace == ns!(html) + fn is_html_element(self) -> bool { + *self.namespace() == ns!(html) } #[allow(unsafe_code)]