Merge master into this branch

1 files changed, 22 insertions, 9 deletions

diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs
index 9ed8ba7a8b6..2d81937849e 100644
--- a/src/components/script/dom/text.rs
+++ b/src/components/script/dom/text.rs
@@ -3,35 +3,48 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use dom::bindings::codegen::TextBinding;
+use dom::bindings::codegen::InheritTypes::TextDerived;
+use dom::bindings::js::JS;
 use dom::bindings::utils::Fallible;
 use dom::characterdata::CharacterData;
-use dom::document::AbstractDocument;
-use dom::node::{AbstractNode, Node, TextNodeTypeId};
+use dom::document::Document;
+use dom::eventtarget::{EventTarget, NodeTargetTypeId};
+use dom::node::{Node, TextNodeTypeId};
 use dom::window::Window;
 use servo_util::str::DOMString;
 
 /// An HTML text node.
+#[deriving(Encodable)]
 pub struct Text {
     characterdata: CharacterData,
 }
 
+impl TextDerived for EventTarget {
+    fn is_text(&self) -> bool {
+        match self.type_id {
+            NodeTargetTypeId(TextNodeTypeId) => true,
+            _ => false
+        }
+    }
+}
+
 impl Text {
-    pub fn new_inherited(text: DOMString, document: AbstractDocument) -> Text {
+    pub fn new_inherited(text: DOMString, document: JS<Document>) -> Text {
         Text {
             characterdata: CharacterData::new_inherited(TextNodeTypeId, text, document)
         }
     }
 
-    pub fn new(text: DOMString, document: AbstractDocument) -> AbstractNode {
-        let node = Text::new_inherited(text, document);
-        Node::reflect_node(@mut node, document, TextBinding::Wrap)
+    pub fn new(text: DOMString, document: &JS<Document>) -> JS<Text> {
+        let node = Text::new_inherited(text, document.clone());
+        Node::reflect_node(~node, document, TextBinding::Wrap)
     }
 
-    pub fn Constructor(owner: @mut Window, text: DOMString) -> Fallible<AbstractNode> {
-        Ok(Text::new(text.clone(), owner.Document()))
+    pub fn Constructor(owner: &JS<Window>, text: DOMString) -> Fallible<JS<Text>> {
+        Ok(Text::new(text.clone(), &owner.get().Document()))
     }
 
-    pub fn SplitText(&self, _offset: u32) -> Fallible<AbstractNode> {
+    pub fn SplitText(&self, _offset: u32) -> Fallible<JS<Text>> {
         fail!("unimplemented")
     }