diff options
| -rw-r--r-- | components/script/dom/htmlareaelement.rs | 12 | ||||
| -rw-r--r-- | components/script/dom/keyboardevent.rs | 11 |
2 files changed, 4 insertions, 19 deletions
diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index 85ccb270cca..0a88f6153a8 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/components/script/dom/htmlareaelement.rs @@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::HTMLAreaElementBinding::HTMLAreaElementMet use dom::bindings::codegen::InheritTypes::{HTMLAreaElementDerived, HTMLElementCast}; use dom::bindings::codegen::InheritTypes::ElementCast; use dom::bindings::js::{MutNullableJS, JSRef, Temporary}; -use dom::bindings::utils::{Reflectable, Reflector}; +use dom::bindings::utils::Reflectable; use dom::document::Document; use dom::domtokenlist::DOMTokenList; use dom::element::ElementTypeId; @@ -21,9 +21,7 @@ use std::default::Default; use string_cache::Atom; use util::str::DOMString; -#[jstraceable] -#[must_root] -#[privatize] +#[dom_struct] pub struct HTMLAreaElement { htmlelement: HTMLElement, rel_list: MutNullableJS<DOMTokenList>, @@ -64,12 +62,6 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLAreaElement> { } } -impl Reflectable for HTMLAreaElement { - fn reflector<'a>(&'a self) -> &'a Reflector { - self.htmlelement.reflector() - } -} - impl<'a> HTMLAreaElementMethods for JSRef<'a, HTMLAreaElement> { fn RelList(self) -> Temporary<DOMTokenList> { self.rel_list.or_init(|| { diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index 7cd1c4b9e98..f220f90a36a 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -9,7 +9,7 @@ use dom::bindings::codegen::InheritTypes::{EventCast, UIEventCast, KeyboardEvent use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, Temporary, RootedReference}; -use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; +use dom::bindings::utils::{Reflectable, reflect_dom_object}; use dom::event::{Event, EventTypeId}; use dom::uievent::UIEvent; use dom::window::Window; @@ -19,8 +19,7 @@ use util::str::DOMString; use std::borrow::ToOwned; use std::cell::{RefCell, Cell}; -#[jstraceable] -#[must_root] +#[dom_struct] pub struct KeyboardEvent { uievent: UIEvent, key: RefCell<DOMString>, @@ -632,9 +631,3 @@ impl<'a> KeyboardEventMethods for JSRef<'a, KeyboardEvent> { self.char_code.get().unwrap_or(self.KeyCode()) } } - -impl Reflectable for KeyboardEvent { - fn reflector<'a>(&'a self) -> &'a Reflector { - self.uievent.reflector() - } -} |