From 6b153834c9229df332312331faa90913df353370 Mon Sep 17 00:00:00 2001 From: Tetsuharu OHZEKI Date: Sat, 28 Jun 2014 03:40:24 +0900 Subject: [PATCH] Remove generate_cacheable_wrapper_node! --- src/components/script/dom/bindings/element.rs | 10 ---------- src/components/script/dom/documentfragment.rs | 7 +++++++ src/components/script/dom/documenttype.rs | 7 +++++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs index f8102ec4a68..dc49fa8a154 100644 --- a/src/components/script/dom/bindings/element.rs +++ b/src/components/script/dom/bindings/element.rs @@ -23,12 +23,6 @@ macro_rules! generate_cacheable_wrapper_htmltablecellelement( ) ) -macro_rules! generate_cacheable_wrapper_node( - ($name: path, $wrap: path) => ( - generate_cacheable_wrapper_base!($name, $wrap, node) - ) -) - macro_rules! generate_cacheable_wrapper_base( ($name: path, $wrap: path, $parent: ident) => ( impl Reflectable for $name { @@ -39,10 +33,6 @@ macro_rules! generate_cacheable_wrapper_base( ) ) -generate_cacheable_wrapper_node!(DocumentFragment, DocumentFragmentBinding::Wrap) - -generate_cacheable_wrapper_node!(DocumentType, DocumentTypeBinding::Wrap) - generate_cacheable_wrapper_htmlelement!(HTMLHeadElement, HTMLHeadElementBinding::Wrap) generate_cacheable_wrapper_htmlelement!(HTMLAnchorElement, HTMLAnchorElementBinding::Wrap) diff --git a/src/components/script/dom/documentfragment.rs b/src/components/script/dom/documentfragment.rs index 823b97601a9..eec2cddac5a 100644 --- a/src/components/script/dom/documentfragment.rs +++ b/src/components/script/dom/documentfragment.rs @@ -6,6 +6,7 @@ use dom::bindings::codegen::InheritTypes::{DocumentFragmentDerived, NodeCast}; use dom::bindings::codegen::Bindings::DocumentFragmentBinding; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::error::Fallible; +use dom::bindings::utils::{Reflectable, Reflector}; use dom::document::Document; use dom::element::Element; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; @@ -73,3 +74,9 @@ impl<'a> DocumentFragmentMethods for JSRef<'a, DocumentFragment> { } } + +impl Reflectable for DocumentFragment { + fn reflector<'a>(&'a self) -> &'a Reflector { + self.node.reflector() + } +} diff --git a/src/components/script/dom/documenttype.rs b/src/components/script/dom/documenttype.rs index 110e650f288..6097199b19a 100644 --- a/src/components/script/dom/documenttype.rs +++ b/src/components/script/dom/documenttype.rs @@ -5,6 +5,7 @@ use dom::bindings::codegen::InheritTypes::{DocumentTypeDerived, NodeCast}; use dom::bindings::codegen::Bindings::DocumentTypeBinding; use dom::bindings::js::{JSRef, Temporary}; +use dom::bindings::utils::{Reflectable, Reflector}; use dom::document::Document; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::node::{Node, DoctypeNodeTypeId, NodeHelpers}; @@ -78,3 +79,9 @@ impl<'a> DocumentTypeMethods for JSRef<'a, DocumentType> { node.remove_self(); } } + +impl Reflectable for DocumentType { + fn reflector<'a>(&'a self) -> &'a Reflector { + self.node.reflector() + } +}