From fe1644f316427d7b672a6caf2f9acd4c362c6667 Mon Sep 17 00:00:00 2001
From: Tetsuharu OHZEKI <saneyuki.snyk@gmail.com>
Date: Sat, 28 Jun 2014 03:29:35 +0900
Subject: [PATCH] Remove generate_cacheable_wrapper_characterdata!

---
 src/components/script/dom/bindings/element.rs      | 12 ------------
 src/components/script/dom/comment.rs               |  7 +++++++
 src/components/script/dom/processinginstruction.rs |  7 +++++++
 src/components/script/dom/text.rs                  |  7 +++++++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs
index 53069b94062..f160994418a 100644
--- a/src/components/script/dom/bindings/element.rs
+++ b/src/components/script/dom/bindings/element.rs
@@ -12,12 +12,6 @@ macro_rules! generate_cacheable_wrapper(
     )
 )
 
-macro_rules! generate_cacheable_wrapper_characterdata(
-    ($name: path, $wrap: path) => (
-        generate_cacheable_wrapper_base!($name, $wrap, characterdata)
-    )
-)
-
 macro_rules! generate_cacheable_wrapper_htmlelement(
     ($name: path, $wrap: path) => (
         generate_cacheable_wrapper_base!($name, $wrap, htmlelement)
@@ -52,16 +46,10 @@ macro_rules! generate_cacheable_wrapper_base(
     )
 )
 
-generate_cacheable_wrapper_characterdata!(Comment, CommentBinding::Wrap)
-
 generate_cacheable_wrapper_node!(DocumentFragment, DocumentFragmentBinding::Wrap)
 
 generate_cacheable_wrapper_node!(DocumentType, DocumentTypeBinding::Wrap)
 
-generate_cacheable_wrapper_characterdata!(Text, TextBinding::Wrap)
-
-generate_cacheable_wrapper_characterdata!(ProcessingInstruction, ProcessingInstruction::Wrap)
-
 generate_cacheable_wrapper_htmlelement!(HTMLHeadElement, HTMLHeadElementBinding::Wrap)
 
 generate_cacheable_wrapper_htmlelement!(HTMLAnchorElement, HTMLAnchorElementBinding::Wrap)
diff --git a/src/components/script/dom/comment.rs b/src/components/script/dom/comment.rs
index af21daf4444..b9172e1ebd5 100644
--- a/src/components/script/dom/comment.rs
+++ b/src/components/script/dom/comment.rs
@@ -6,6 +6,7 @@ use dom::bindings::codegen::InheritTypes::CommentDerived;
 use dom::bindings::codegen::Bindings::CommentBinding;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::error::Fallible;
+use dom::bindings::utils::{Reflectable, Reflector};
 use dom::characterdata::CharacterData;
 use dom::document::Document;
 use dom::eventtarget::{EventTarget, NodeTargetTypeId};
@@ -45,3 +46,9 @@ impl Comment {
 
 pub trait CommentMethods {
 }
+
+impl Reflectable for Comment {
+    fn reflector<'a>(&'a self) -> &'a Reflector {
+        self.characterdata.reflector()
+    }
+}
diff --git a/src/components/script/dom/processinginstruction.rs b/src/components/script/dom/processinginstruction.rs
index f0e291b1eed..db6a9a0affe 100644
--- a/src/components/script/dom/processinginstruction.rs
+++ b/src/components/script/dom/processinginstruction.rs
@@ -5,6 +5,7 @@
 use dom::bindings::codegen::Bindings::ProcessingInstructionBinding;
 use dom::bindings::codegen::InheritTypes::ProcessingInstructionDerived;
 use dom::bindings::js::{JSRef, Temporary};
+use dom::bindings::utils::{Reflectable, Reflector};
 use dom::characterdata::CharacterData;
 use dom::document::Document;
 use dom::eventtarget::{EventTarget, NodeTargetTypeId};
@@ -47,3 +48,9 @@ impl<'a> ProcessingInstructionMethods for JSRef<'a, ProcessingInstruction> {
         self.target.clone()
     }
 }
+
+impl Reflectable for ProcessingInstruction {
+    fn reflector<'a>(&'a self) -> &'a Reflector {
+        self.characterdata.reflector()
+    }
+}
diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs
index c4fbdb0c639..30490d489f9 100644
--- a/src/components/script/dom/text.rs
+++ b/src/components/script/dom/text.rs
@@ -6,6 +6,7 @@ use dom::bindings::codegen::Bindings::TextBinding;
 use dom::bindings::codegen::InheritTypes::TextDerived;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::error::Fallible;
+use dom::bindings::utils::{Reflectable, Reflector};
 use dom::characterdata::CharacterData;
 use dom::document::Document;
 use dom::eventtarget::{EventTarget, NodeTargetTypeId};
@@ -45,3 +46,9 @@ impl Text {
 
 pub trait TextMethods {
 }
+
+impl Reflectable for Text {
+    fn reflector<'a>(&'a self) -> &'a Reflector {
+        self.characterdata.reflector()
+    }
+}