Rename the element field of the DOM Node hierarchy

Renamed htmlelement, and element

Fixes #924

1 files changed, 4 insertions, 4 deletions

diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs
index 283f0a74f4e..b59dd2b7910 100644
--- a/src/components/script/dom/characterdata.rs
+++ b/src/components/script/dom/characterdata.rs
@@ -10,14 +10,14 @@ use dom::node::{Node, NodeTypeId, ScriptView};
 use js::jsapi::{JSObject, JSContext};
 
 pub struct CharacterData {
-    parent: Node<ScriptView>,
+    element: Node<ScriptView>,
     data: ~str
 }
 
 impl CharacterData {
     pub fn new(id: NodeTypeId, data: ~str) -> CharacterData {
         CharacterData {
-            parent: Node::new(id),
+            element: Node::new(id),
             data: data
         }
     }
@@ -59,7 +59,7 @@ impl CharacterData {
 
 impl CacheableWrapper for CharacterData {
     fn get_wrappercache(&mut self) -> &mut WrapperCache {
-        self.parent.get_wrappercache()
+        self.element.get_wrappercache()
     }
 
     fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {
@@ -69,6 +69,6 @@ impl CacheableWrapper for CharacterData {
 
 impl BindingObject for CharacterData {
     fn GetParentObject(&self, cx: *JSContext) -> Option<@mut CacheableWrapper> {
-        self.parent.GetParentObject(cx)
+        self.element.GetParentObject(cx)
     }
 }