Merge master into this branch

1 files changed, 19 insertions, 6 deletions

diff --git a/src/components/script/dom/processinginstruction.rs b/src/components/script/dom/processinginstruction.rs
index 0fd830be452..85d247fe94a 100644
--- a/src/components/script/dom/processinginstruction.rs
+++ b/src/components/script/dom/processinginstruction.rs
@@ -3,28 +3,41 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use dom::bindings::codegen::ProcessingInstructionBinding;
+use dom::bindings::codegen::InheritTypes::ProcessingInstructionDerived;
+use dom::bindings::js::JS;
 use dom::characterdata::CharacterData;
-use dom::document::AbstractDocument;
-use dom::node::{AbstractNode, Node, ProcessingInstructionNodeTypeId};
+use dom::document::Document;
+use dom::eventtarget::{EventTarget, NodeTargetTypeId};
+use dom::node::{Node, ProcessingInstructionNodeTypeId};
 use servo_util::str::DOMString;
 
 /// An HTML processing instruction node.
+#[deriving(Encodable)]
 pub struct ProcessingInstruction {
     characterdata: CharacterData,
     target: DOMString,
 }
 
+impl ProcessingInstructionDerived for EventTarget {
+    fn is_processinginstruction(&self) -> bool {
+        match self.type_id {
+            NodeTargetTypeId(ProcessingInstructionNodeTypeId) => true,
+            _ => false
+        }
+    }
+}
+
 impl ProcessingInstruction {
-    pub fn new_inherited(target: DOMString, data: DOMString, document: AbstractDocument) -> ProcessingInstruction {
+    pub fn new_inherited(target: DOMString, data: DOMString, document: JS<Document>) -> ProcessingInstruction {
         ProcessingInstruction {
             characterdata: CharacterData::new_inherited(ProcessingInstructionNodeTypeId, data, document),
             target: target
         }
     }
 
-    pub fn new(target: DOMString, data: DOMString, document: AbstractDocument) -> AbstractNode {
-        let node = ProcessingInstruction::new_inherited(target, data, document);
-        Node::reflect_node(@mut node, document, ProcessingInstructionBinding::Wrap)
+    pub fn new(target: DOMString, data: DOMString, document: &JS<Document>) -> JS<ProcessingInstruction> {
+        let node = ProcessingInstruction::new_inherited(target, data, document.clone());
+        Node::reflect_node(~node, document, ProcessingInstructionBinding::Wrap)
     }
 }