auto merge of #1702 : quandrum/servo/element_to_characterdata, r=jdm

... to characterdata

All other node's parent type names reflect the actual type of the parent. This change extends that convention to the indicated nodes.

closes #1594

1 files changed, 2 insertions, 2 deletions

diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs
index fc57050a3b5..adf248ef07f 100644
--- a/src/components/script/dom/node.rs
+++ b/src/components/script/dom/node.rs
@@ -1064,7 +1064,7 @@ impl Node {
                 for node in abstract_self.traverse_preorder() {
                     if node.is_text() {
                         node.with_imm_text(|text| {
-                            content = content + text.element.Data();
+                            content = content + text.characterdata.Data();
                         })
                     }
                 }
@@ -1591,7 +1591,7 @@ impl Node {
             node.with_imm_processing_instruction(|pi| {
                 other.with_imm_processing_instruction(|other_pi| {
                     (pi.target == other_pi.target) &&
-                    (pi.element.data == other_pi.element.data)
+                    (pi.characterdata.data == other_pi.characterdata.data)
                 })
             })
         }