auto merge of #2633 : Ms2ger/servo/derefmut, r=jdm

Part of #1854.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs
index a1c6d709a47..bb0364672d0 100644
--- a/src/components/script/dom/htmlserializer.rs
+++ b/src/components/script/dom/htmlserializer.rs
@@ -67,7 +67,7 @@ pub fn serialize(iterator: &mut NodeIterator) -> String {
 
 fn serialize_comment(comment: &JSRef<Comment>, html: &mut String) {
     html.push_str("<!--");
-    html.push_str(comment.deref().characterdata.data.as_slice());
+    html.push_str(comment.deref().characterdata.data.deref().borrow().as_slice());
     html.push_str("-->");
 }
 
@@ -80,11 +80,11 @@ fn serialize_text(text: &JSRef<Text>, html: &mut String) {
                 "style" | "script" | "xmp" | "iframe" |
                 "noembed" | "noframes" | "plaintext" |
                 "noscript" if elem.deref().namespace == namespace::HTML
-                => html.push_str(text.deref().characterdata.data.as_slice()),
-                _ => escape(text.deref().characterdata.data.as_slice(), false, html)
+                => html.push_str(text.deref().characterdata.data.deref().borrow().as_slice()),
+                _ => escape(text.deref().characterdata.data.deref().borrow().as_slice(), false, html)
             }
         }
-        _ => escape(text.deref().characterdata.data.as_slice(), false, html)
+        _ => escape(text.deref().characterdata.data.deref().borrow().as_slice(), false, html)
     }
 }
 
@@ -93,7 +93,7 @@ fn serialize_processing_instruction(processing_instruction: &JSRef<ProcessingIns
     html.push_str("<?");
     html.push_str(processing_instruction.deref().target.as_slice());
     html.push_char(' ');
-    html.push_str(processing_instruction.deref().characterdata.data.as_slice());
+    html.push_str(processing_instruction.deref().characterdata.data.deref().borrow().as_slice());
     html.push_str("?>");
 }
 
@@ -118,7 +118,7 @@ fn serialize_elem(elem: &JSRef<Element>, open_elements: &mut Vec<String>, html:
             match node.first_child().map(|child| child.root()) {
                 Some(ref child) if child.is_text() => {
                     let text: &JSRef<CharacterData> = CharacterDataCast::to_ref(&**child).unwrap();
-                    if text.deref().data.len() > 0 && text.deref().data.as_slice().char_at(0) == '\n' {
+                    if text.deref().data.deref().borrow().len() > 0 && text.deref().data.deref().borrow().as_slice().char_at(0) == '\n' {
                         html.push_char('\x0A');
                     }
                 },