Make LayoutCharacterDataHelpers::data_for_layout be safe

2 files changed, 5 insertions, 7 deletions

diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
index 4e0d32d4456..f8c5acb5a8f 100644
--- a/components/script/dom/characterdata.rs
+++ b/components/script/dom/characterdata.rs
@@ -280,16 +280,15 @@ impl CharacterDataMethods for CharacterData {
     }
 }
 
-#[allow(unsafe_code)]
 pub trait LayoutCharacterDataHelpers<'dom> {
-    unsafe fn data_for_layout(self) -> &'dom str;
+    fn data_for_layout(self) -> &'dom str;
 }
 
-#[allow(unsafe_code)]
 impl<'dom> LayoutCharacterDataHelpers<'dom> for LayoutDom<'dom, CharacterData> {
+    #[allow(unsafe_code)]
     #[inline]
-    unsafe fn data_for_layout(self) -> &'dom str {
-        &(*self.unsafe_get()).data.borrow_for_layout()
+    fn data_for_layout(self) -> &'dom str {
+        unsafe { self.unsafe_get().data.borrow_for_layout() }
     }
 }
 
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 425e29d45f3..07b7d60cbe6 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -1456,10 +1456,9 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> {
         val
     }
 
-    #[allow(unsafe_code)]
     fn text_content(self) -> String {
         if let Some(text) = self.downcast::<Text>() {
-            return unsafe { text.upcast().data_for_layout().to_owned() };
+            return text.upcast().data_for_layout().to_owned();
         }
 
         if let Some(input) = self.downcast::<HTMLInputElement>() {