1 files changed, 17 insertions, 9 deletions
diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs
index 417ae255cb9..ac523808241 100644
--- a/src/components/script/dom/text.rs
+++ b/src/components/script/dom/text.rs
@@ -4,13 +4,13 @@
 
 use dom::bindings::codegen::BindingDeclarations::TextBinding;
 use dom::bindings::codegen::InheritTypes::TextDerived;
-use dom::bindings::js::JS;
+use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::error::Fallible;
 use dom::characterdata::CharacterData;
 use dom::document::Document;
 use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::node::{Node, TextNodeTypeId};
-use dom::window::Window;
+use dom::window::{Window, WindowMethods};
 use servo_util::str::DOMString;
 
 /// An HTML text node.
@@ -29,26 +29,34 @@ impl TextDerived for EventTarget {
 }
 
 impl Text {
-    pub fn new_inherited(text: DOMString, document: JS<Document>) -> Text {
+    pub fn new_inherited(text: DOMString, document: &JSRef<Document>) -> Text {
         Text {
             characterdata: CharacterData::new_inherited(TextNodeTypeId, text, document)
         }
     }
 
-    pub fn new(text: DOMString, document: &JS<Document>) -> JS<Text> {
-        let node = Text::new_inherited(text, document.clone());
+    pub fn new(text: DOMString, document: &JSRef<Document>) -> Temporary<Text> {
+        let node = Text::new_inherited(text, document);
         Node::reflect_node(~node, document, TextBinding::Wrap)
     }
 
-    pub fn Constructor(owner: &JS<Window>, text: DOMString) -> Fallible<JS<Text>> {
-        Ok(Text::new(text.clone(), &owner.get().Document()))
+    pub fn Constructor(owner: &JSRef<Window>, text: DOMString) -> Fallible<Temporary<Text>> {
+        let document = owner.Document().root();
+        Ok(Text::new(text.clone(), &*document))
     }
+}
+
+pub trait TextMethods {
+    fn SplitText(&self, _offset: u32) -> Fallible<Temporary<Text>>;
+    fn GetWholeText(&self) -> Fallible<DOMString>;
+}
 
-    pub fn SplitText(&self, _offset: u32) -> Fallible<JS<Text>> {
+impl<'a> TextMethods for JSRef<'a, Text> {
+    fn SplitText(&self, _offset: u32) -> Fallible<Temporary<Text>> {
         fail!("unimplemented")
     }
 
-    pub fn GetWholeText(&self) -> Fallible<DOMString> {
+    fn GetWholeText(&self) -> Fallible<DOMString> {
         Ok(~"")
     }
 }