Privatize EventTarget and EventListenerEntry

This commit is contained in:
Tim Taubert 2014-10-12 13:24:24 +02:00
parent ba073d7e99
commit df60f8b2c5
82 changed files with 91 additions and 84 deletions

View file

@ -26,7 +26,7 @@ pub struct CharacterData {
impl CharacterDataDerived for EventTarget { impl CharacterDataDerived for EventTarget {
fn is_characterdata(&self) -> bool { fn is_characterdata(&self) -> bool {
match self.type_id { match *self.type_id() {
NodeTargetTypeId(TextNodeTypeId) | NodeTargetTypeId(TextNodeTypeId) |
NodeTargetTypeId(CommentNodeTypeId) | NodeTargetTypeId(CommentNodeTypeId) |
NodeTargetTypeId(ProcessingInstructionNodeTypeId) => true, NodeTargetTypeId(ProcessingInstructionNodeTypeId) => true,

View file

@ -25,7 +25,7 @@ pub struct Comment {
impl CommentDerived for EventTarget { impl CommentDerived for EventTarget {
fn is_comment(&self) -> bool { fn is_comment(&self) -> bool {
self.type_id == NodeTargetTypeId(CommentNodeTypeId) *self.type_id() == NodeTargetTypeId(CommentNodeTypeId)
} }
} }

View file

@ -193,7 +193,7 @@ impl Reflectable for DedicatedWorkerGlobalScope {
impl DedicatedWorkerGlobalScopeDerived for EventTarget { impl DedicatedWorkerGlobalScopeDerived for EventTarget {
fn is_dedicatedworkerglobalscope(&self) -> bool { fn is_dedicatedworkerglobalscope(&self) -> bool {
match self.type_id { match *self.type_id() {
WorkerGlobalScopeTypeId(DedicatedGlobalScope) => true, WorkerGlobalScopeTypeId(DedicatedGlobalScope) => true,
_ => false _ => false
} }

View file

@ -98,7 +98,7 @@ pub struct Document {
impl DocumentDerived for EventTarget { impl DocumentDerived for EventTarget {
fn is_document(&self) -> bool { fn is_document(&self) -> bool {
self.type_id == NodeTargetTypeId(DocumentNodeTypeId) *self.type_id() == NodeTargetTypeId(DocumentNodeTypeId)
} }
} }

View file

@ -27,7 +27,7 @@ pub struct DocumentFragment {
impl DocumentFragmentDerived for EventTarget { impl DocumentFragmentDerived for EventTarget {
fn is_documentfragment(&self) -> bool { fn is_documentfragment(&self) -> bool {
self.type_id == NodeTargetTypeId(DocumentFragmentNodeTypeId) *self.type_id() == NodeTargetTypeId(DocumentFragmentNodeTypeId)
} }
} }

View file

@ -25,7 +25,7 @@ pub struct DocumentType {
impl DocumentTypeDerived for EventTarget { impl DocumentTypeDerived for EventTarget {
fn is_documenttype(&self) -> bool { fn is_documenttype(&self) -> bool {
self.type_id == NodeTargetTypeId(DoctypeNodeTypeId) *self.type_id() == NodeTargetTypeId(DoctypeNodeTypeId)
} }
} }

View file

@ -57,7 +57,7 @@ pub struct Element {
impl ElementDerived for EventTarget { impl ElementDerived for EventTarget {
fn is_element(&self) -> bool { fn is_element(&self) -> bool {
match self.type_id { match *self.type_id() {
NodeTargetTypeId(ElementNodeTypeId(_)) => true, NodeTargetTypeId(ElementNodeTypeId(_)) => true,
_ => false _ => false
} }

View file

@ -59,15 +59,17 @@ impl EventListenerType {
#[deriving(PartialEq)] #[deriving(PartialEq)]
#[jstraceable] #[jstraceable]
#[privatize]
pub struct EventListenerEntry { pub struct EventListenerEntry {
pub phase: ListenerPhase, phase: ListenerPhase,
pub listener: EventListenerType listener: EventListenerType
} }
#[jstraceable] #[jstraceable]
#[must_root] #[must_root]
#[privatize]
pub struct EventTarget { pub struct EventTarget {
pub type_id: EventTargetTypeId, type_id: EventTargetTypeId,
reflector_: Reflector, reflector_: Reflector,
handlers: RefCell<HashMap<DOMString, Vec<EventListenerEntry>>>, handlers: RefCell<HashMap<DOMString, Vec<EventListenerEntry>>>,
} }
@ -94,6 +96,11 @@ impl EventTarget {
filtered.map(|entry| entry.listener.get_listener()).collect() filtered.map(|entry| entry.listener.get_listener()).collect()
}) })
} }
#[inline]
pub fn type_id<'a>(&'a self) -> &'a EventTargetTypeId {
&self.type_id
}
} }
pub trait EventTargetHelpers { pub trait EventTargetHelpers {

View file

@ -30,7 +30,7 @@ pub struct HTMLAnchorElement {
impl HTMLAnchorElementDerived for EventTarget { impl HTMLAnchorElementDerived for EventTarget {
fn is_htmlanchorelement(&self) -> bool { fn is_htmlanchorelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAnchorElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAnchorElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLAppletElement {
impl HTMLAppletElementDerived for EventTarget { impl HTMLAppletElementDerived for EventTarget {
fn is_htmlappletelement(&self) -> bool { fn is_htmlappletelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAppletElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAppletElementTypeId))
} }
} }

View file

@ -23,7 +23,7 @@ pub struct HTMLAreaElement {
impl HTMLAreaElementDerived for EventTarget { impl HTMLAreaElementDerived for EventTarget {
fn is_htmlareaelement(&self) -> bool { fn is_htmlareaelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAreaElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAreaElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLAudioElement {
impl HTMLAudioElementDerived for EventTarget { impl HTMLAudioElementDerived for EventTarget {
fn is_htmlaudioelement(&self) -> bool { fn is_htmlaudioelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLBaseElement {
impl HTMLBaseElementDerived for EventTarget { impl HTMLBaseElementDerived for EventTarget {
fn is_htmlbaseelement(&self) -> bool { fn is_htmlbaseelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBaseElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLBaseElementTypeId))
} }
} }

View file

@ -29,7 +29,7 @@ pub struct HTMLBodyElement {
impl HTMLBodyElementDerived for EventTarget { impl HTMLBodyElementDerived for EventTarget {
fn is_htmlbodyelement(&self) -> bool { fn is_htmlbodyelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBodyElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLBodyElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLBRElement {
impl HTMLBRElementDerived for EventTarget { impl HTMLBRElementDerived for EventTarget {
fn is_htmlbrelement(&self) -> bool { fn is_htmlbrelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBRElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLBRElementTypeId))
} }
} }

View file

@ -29,7 +29,7 @@ pub struct HTMLButtonElement {
impl HTMLButtonElementDerived for EventTarget { impl HTMLButtonElementDerived for EventTarget {
fn is_htmlbuttonelement(&self) -> bool { fn is_htmlbuttonelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLButtonElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLButtonElementTypeId))
} }
} }

View file

@ -40,7 +40,7 @@ pub struct HTMLCanvasElement {
impl HTMLCanvasElementDerived for EventTarget { impl HTMLCanvasElementDerived for EventTarget {
fn is_htmlcanvaselement(&self) -> bool { fn is_htmlcanvaselement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLCanvasElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLCanvasElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLDataElement {
impl HTMLDataElementDerived for EventTarget { impl HTMLDataElementDerived for EventTarget {
fn is_htmldataelement(&self) -> bool { fn is_htmldataelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDataElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDataElementTypeId))
} }
} }

View file

@ -25,7 +25,7 @@ pub struct HTMLDataListElement {
impl HTMLDataListElementDerived for EventTarget { impl HTMLDataListElementDerived for EventTarget {
fn is_htmldatalistelement(&self) -> bool { fn is_htmldatalistelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDataListElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDataListElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLDirectoryElement {
impl HTMLDirectoryElementDerived for EventTarget { impl HTMLDirectoryElementDerived for EventTarget {
fn is_htmldirectoryelement(&self) -> bool { fn is_htmldirectoryelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDirectoryElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDirectoryElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLDivElement {
impl HTMLDivElementDerived for EventTarget { impl HTMLDivElementDerived for EventTarget {
fn is_htmldivelement(&self) -> bool { fn is_htmldivelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDivElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDivElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLDListElement {
impl HTMLDListElementDerived for EventTarget { impl HTMLDListElementDerived for EventTarget {
fn is_htmldlistelement(&self) -> bool { fn is_htmldlistelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDListElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDListElementTypeId))
} }
} }

View file

@ -29,7 +29,7 @@ pub struct HTMLElement {
impl HTMLElementDerived for EventTarget { impl HTMLElementDerived for EventTarget {
fn is_htmlelement(&self) -> bool { fn is_htmlelement(&self) -> bool {
match self.type_id { match *self.type_id() {
NodeTargetTypeId(ElementNodeTypeId(ElementTypeId_)) => false, NodeTargetTypeId(ElementNodeTypeId(ElementTypeId_)) => false,
NodeTargetTypeId(ElementNodeTypeId(_)) => true, NodeTargetTypeId(ElementNodeTypeId(_)) => true,
_ => false _ => false

View file

@ -22,7 +22,7 @@ pub struct HTMLEmbedElement {
impl HTMLEmbedElementDerived for EventTarget { impl HTMLEmbedElementDerived for EventTarget {
fn is_htmlembedelement(&self) -> bool { fn is_htmlembedelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLEmbedElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLEmbedElementTypeId))
} }
} }

View file

@ -30,7 +30,7 @@ pub struct HTMLFieldSetElement {
impl HTMLFieldSetElementDerived for EventTarget { impl HTMLFieldSetElementDerived for EventTarget {
fn is_htmlfieldsetelement(&self) -> bool { fn is_htmlfieldsetelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFieldSetElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFieldSetElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLFontElement {
impl HTMLFontElementDerived for EventTarget { impl HTMLFontElementDerived for EventTarget {
fn is_htmlfontelement(&self) -> bool { fn is_htmlfontelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFontElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFontElementTypeId))
} }
} }

View file

@ -38,7 +38,7 @@ pub struct HTMLFormElement {
impl HTMLFormElementDerived for EventTarget { impl HTMLFormElementDerived for EventTarget {
fn is_htmlformelement(&self) -> bool { fn is_htmlformelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFormElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFormElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLFrameElement {
impl HTMLFrameElementDerived for EventTarget { impl HTMLFrameElementDerived for EventTarget {
fn is_htmlframeelement(&self) -> bool { fn is_htmlframeelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLFrameSetElement {
impl HTMLFrameSetElementDerived for EventTarget { impl HTMLFrameSetElementDerived for EventTarget {
fn is_htmlframesetelement(&self) -> bool { fn is_htmlframesetelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameSetElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameSetElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLHeadElement {
impl HTMLHeadElementDerived for EventTarget { impl HTMLHeadElementDerived for EventTarget {
fn is_htmlheadelement(&self) -> bool { fn is_htmlheadelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadElementTypeId))
} }
} }

View file

@ -33,7 +33,7 @@ pub struct HTMLHeadingElement {
impl HTMLHeadingElementDerived for EventTarget { impl HTMLHeadingElementDerived for EventTarget {
fn is_htmlheadingelement(&self) -> bool { fn is_htmlheadingelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadingElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadingElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLHRElement {
impl HTMLHRElementDerived for EventTarget { impl HTMLHRElementDerived for EventTarget {
fn is_htmlhrelement(&self) -> bool { fn is_htmlhrelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHRElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHRElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLHtmlElement {
impl HTMLHtmlElementDerived for EventTarget { impl HTMLHtmlElementDerived for EventTarget {
fn is_htmlhtmlelement(&self) -> bool { fn is_htmlhtmlelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHtmlElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHtmlElementTypeId))
} }
} }

View file

@ -50,7 +50,7 @@ pub struct HTMLIFrameElement {
impl HTMLIFrameElementDerived for EventTarget { impl HTMLIFrameElementDerived for EventTarget {
fn is_htmliframeelement(&self) -> bool { fn is_htmliframeelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId))
} }
} }

View file

@ -34,7 +34,7 @@ pub struct HTMLImageElement {
impl HTMLImageElementDerived for EventTarget { impl HTMLImageElementDerived for EventTarget {
fn is_htmlimageelement(&self) -> bool { fn is_htmlimageelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLImageElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLImageElementTypeId))
} }
} }

View file

@ -57,7 +57,7 @@ pub struct HTMLInputElement {
impl HTMLInputElementDerived for EventTarget { impl HTMLInputElementDerived for EventTarget {
fn is_htmlinputelement(&self) -> bool { fn is_htmlinputelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLInputElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLInputElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLLabelElement {
impl HTMLLabelElementDerived for EventTarget { impl HTMLLabelElementDerived for EventTarget {
fn is_htmllabelelement(&self) -> bool { fn is_htmllabelelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLabelElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLabelElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLLegendElement {
impl HTMLLegendElementDerived for EventTarget { impl HTMLLegendElementDerived for EventTarget {
fn is_htmllegendelement(&self) -> bool { fn is_htmllegendelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLegendElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLegendElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLLIElement {
impl HTMLLIElementDerived for EventTarget { impl HTMLLIElementDerived for EventTarget {
fn is_htmllielement(&self) -> bool { fn is_htmllielement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLIElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLIElementTypeId))
} }
} }

View file

@ -30,7 +30,7 @@ pub struct HTMLLinkElement {
impl HTMLLinkElementDerived for EventTarget { impl HTMLLinkElementDerived for EventTarget {
fn is_htmllinkelement(&self) -> bool { fn is_htmllinkelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLinkElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLinkElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLMapElement {
impl HTMLMapElementDerived for EventTarget { impl HTMLMapElementDerived for EventTarget {
fn is_htmlmapelement(&self) -> bool { fn is_htmlmapelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMapElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLMapElementTypeId))
} }
} }

View file

@ -21,7 +21,7 @@ pub struct HTMLMediaElement {
impl HTMLMediaElementDerived for EventTarget { impl HTMLMediaElementDerived for EventTarget {
fn is_htmlmediaelement(&self) -> bool { fn is_htmlmediaelement(&self) -> bool {
match self.type_id { match *self.type_id() {
NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) | NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) |
NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) => true, NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) => true,
_ => false _ => false

View file

@ -22,7 +22,7 @@ pub struct HTMLMetaElement {
impl HTMLMetaElementDerived for EventTarget { impl HTMLMetaElementDerived for EventTarget {
fn is_htmlmetaelement(&self) -> bool { fn is_htmlmetaelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMetaElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLMetaElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLMeterElement {
impl HTMLMeterElementDerived for EventTarget { impl HTMLMeterElementDerived for EventTarget {
fn is_htmlmeterelement(&self) -> bool { fn is_htmlmeterelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMeterElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLMeterElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLModElement {
impl HTMLModElementDerived for EventTarget { impl HTMLModElementDerived for EventTarget {
fn is_htmlmodelement(&self) -> bool { fn is_htmlmodelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLModElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLModElementTypeId))
} }
} }

View file

@ -34,7 +34,7 @@ pub struct HTMLObjectElement {
impl HTMLObjectElementDerived for EventTarget { impl HTMLObjectElementDerived for EventTarget {
fn is_htmlobjectelement(&self) -> bool { fn is_htmlobjectelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLObjectElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLObjectElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLOListElement {
impl HTMLOListElementDerived for EventTarget { impl HTMLOListElementDerived for EventTarget {
fn is_htmlolistelement(&self) -> bool { fn is_htmlolistelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOListElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOListElementTypeId))
} }
} }

View file

@ -27,7 +27,7 @@ pub struct HTMLOptGroupElement {
impl HTMLOptGroupElementDerived for EventTarget { impl HTMLOptGroupElementDerived for EventTarget {
fn is_htmloptgroupelement(&self) -> bool { fn is_htmloptgroupelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOptGroupElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOptGroupElementTypeId))
} }
} }

View file

@ -31,7 +31,7 @@ pub struct HTMLOptionElement {
impl HTMLOptionElementDerived for EventTarget { impl HTMLOptionElementDerived for EventTarget {
fn is_htmloptionelement(&self) -> bool { fn is_htmloptionelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOptionElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOptionElementTypeId))
} }
} }

View file

@ -24,7 +24,7 @@ pub struct HTMLOutputElement {
impl HTMLOutputElementDerived for EventTarget { impl HTMLOutputElementDerived for EventTarget {
fn is_htmloutputelement(&self) -> bool { fn is_htmloutputelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOutputElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOutputElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLParagraphElement {
impl HTMLParagraphElementDerived for EventTarget { impl HTMLParagraphElementDerived for EventTarget {
fn is_htmlparagraphelement(&self) -> bool { fn is_htmlparagraphelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLParagraphElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLParagraphElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLParamElement {
impl HTMLParamElementDerived for EventTarget { impl HTMLParamElementDerived for EventTarget {
fn is_htmlparamelement(&self) -> bool { fn is_htmlparamelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLParamElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLParamElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLPreElement {
impl HTMLPreElementDerived for EventTarget { impl HTMLPreElementDerived for EventTarget {
fn is_htmlpreelement(&self) -> bool { fn is_htmlpreelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLPreElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLPreElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLProgressElement {
impl HTMLProgressElementDerived for EventTarget { impl HTMLProgressElementDerived for EventTarget {
fn is_htmlprogresselement(&self) -> bool { fn is_htmlprogresselement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLProgressElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLProgressElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLQuoteElement {
impl HTMLQuoteElementDerived for EventTarget { impl HTMLQuoteElementDerived for EventTarget {
fn is_htmlquoteelement(&self) -> bool { fn is_htmlquoteelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLQuoteElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLQuoteElementTypeId))
} }
} }

View file

@ -27,7 +27,7 @@ pub struct HTMLScriptElement {
impl HTMLScriptElementDerived for EventTarget { impl HTMLScriptElementDerived for EventTarget {
fn is_htmlscriptelement(&self) -> bool { fn is_htmlscriptelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLScriptElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLScriptElementTypeId))
} }
} }

View file

@ -30,7 +30,7 @@ pub struct HTMLSelectElement {
impl HTMLSelectElementDerived for EventTarget { impl HTMLSelectElementDerived for EventTarget {
fn is_htmlselectelement(&self) -> bool { fn is_htmlselectelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSelectElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLSelectElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLSourceElement {
impl HTMLSourceElementDerived for EventTarget { impl HTMLSourceElementDerived for EventTarget {
fn is_htmlsourceelement(&self) -> bool { fn is_htmlsourceelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSourceElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLSourceElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLSpanElement {
impl HTMLSpanElementDerived for EventTarget { impl HTMLSpanElementDerived for EventTarget {
fn is_htmlspanelement(&self) -> bool { fn is_htmlspanelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSpanElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLSpanElementTypeId))
} }
} }

View file

@ -26,7 +26,7 @@ pub struct HTMLStyleElement {
impl HTMLStyleElementDerived for EventTarget { impl HTMLStyleElementDerived for EventTarget {
fn is_htmlstyleelement(&self) -> bool { fn is_htmlstyleelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLStyleElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLStyleElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTableCaptionElement {
impl HTMLTableCaptionElementDerived for EventTarget { impl HTMLTableCaptionElementDerived for EventTarget {
fn is_htmltablecaptionelement(&self) -> bool { fn is_htmltablecaptionelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableCaptionElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableCaptionElementTypeId))
} }
} }

View file

@ -21,7 +21,7 @@ pub struct HTMLTableCellElement {
impl HTMLTableCellElementDerived for EventTarget { impl HTMLTableCellElementDerived for EventTarget {
fn is_htmltablecellelement(&self) -> bool { fn is_htmltablecellelement(&self) -> bool {
match self.type_id { match *self.type_id() {
NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) | NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) |
NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) => true, NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) => true,
_ => false _ => false

View file

@ -22,7 +22,7 @@ pub struct HTMLTableColElement {
impl HTMLTableColElementDerived for EventTarget { impl HTMLTableColElementDerived for EventTarget {
fn is_htmltablecolelement(&self) -> bool { fn is_htmltablecolelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableColElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableColElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTableDataCellElement {
impl HTMLTableDataCellElementDerived for EventTarget { impl HTMLTableDataCellElementDerived for EventTarget {
fn is_htmltabledatacellelement(&self) -> bool { fn is_htmltabledatacellelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId))
} }
} }

View file

@ -26,7 +26,7 @@ pub struct HTMLTableElement {
impl HTMLTableElementDerived for EventTarget { impl HTMLTableElementDerived for EventTarget {
fn is_htmltableelement(&self) -> bool { fn is_htmltableelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTableHeaderCellElement {
impl HTMLTableHeaderCellElementDerived for EventTarget { impl HTMLTableHeaderCellElementDerived for EventTarget {
fn is_htmltableheadercellelement(&self) -> bool { fn is_htmltableheadercellelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTableRowElement {
impl HTMLTableRowElementDerived for EventTarget { impl HTMLTableRowElementDerived for EventTarget {
fn is_htmltablerowelement(&self) -> bool { fn is_htmltablerowelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableRowElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableRowElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTableSectionElement {
impl HTMLTableSectionElementDerived for EventTarget { impl HTMLTableSectionElementDerived for EventTarget {
fn is_htmltablesectionelement(&self) -> bool { fn is_htmltablesectionelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableSectionElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableSectionElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTemplateElement {
impl HTMLTemplateElementDerived for EventTarget { impl HTMLTemplateElementDerived for EventTarget {
fn is_htmltemplateelement(&self) -> bool { fn is_htmltemplateelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTemplateElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTemplateElementTypeId))
} }
} }

View file

@ -27,7 +27,7 @@ pub struct HTMLTextAreaElement {
impl HTMLTextAreaElementDerived for EventTarget { impl HTMLTextAreaElementDerived for EventTarget {
fn is_htmltextareaelement(&self) -> bool { fn is_htmltextareaelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTextAreaElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTextAreaElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTimeElement {
impl HTMLTimeElementDerived for EventTarget { impl HTMLTimeElementDerived for EventTarget {
fn is_htmltimeelement(&self) -> bool { fn is_htmltimeelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTimeElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTimeElementTypeId))
} }
} }

View file

@ -25,7 +25,7 @@ pub struct HTMLTitleElement {
impl HTMLTitleElementDerived for EventTarget { impl HTMLTitleElementDerived for EventTarget {
fn is_htmltitleelement(&self) -> bool { fn is_htmltitleelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTitleElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTitleElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLTrackElement {
impl HTMLTrackElementDerived for EventTarget { impl HTMLTrackElementDerived for EventTarget {
fn is_htmltrackelement(&self) -> bool { fn is_htmltrackelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTrackElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTrackElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLUListElement {
impl HTMLUListElementDerived for EventTarget { impl HTMLUListElementDerived for EventTarget {
fn is_htmlulistelement(&self) -> bool { fn is_htmlulistelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLUListElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLUListElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLUnknownElement {
impl HTMLUnknownElementDerived for EventTarget { impl HTMLUnknownElementDerived for EventTarget {
fn is_htmlunknownelement(&self) -> bool { fn is_htmlunknownelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLUnknownElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLUnknownElementTypeId))
} }
} }

View file

@ -22,7 +22,7 @@ pub struct HTMLVideoElement {
impl HTMLVideoElementDerived for EventTarget { impl HTMLVideoElementDerived for EventTarget {
fn is_htmlvideoelement(&self) -> bool { fn is_htmlvideoelement(&self) -> bool {
self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId))
} }
} }

View file

@ -115,7 +115,7 @@ pub struct Node {
impl NodeDerived for EventTarget { impl NodeDerived for EventTarget {
fn is_node(&self) -> bool { fn is_node(&self) -> bool {
match self.type_id { match *self.type_id() {
NodeTargetTypeId(_) => true, NodeTargetTypeId(_) => true,
_ => false _ => false
} }

View file

@ -23,7 +23,7 @@ pub struct ProcessingInstruction {
impl ProcessingInstructionDerived for EventTarget { impl ProcessingInstructionDerived for EventTarget {
fn is_processinginstruction(&self) -> bool { fn is_processinginstruction(&self) -> bool {
self.type_id == NodeTargetTypeId(ProcessingInstructionNodeTypeId) *self.type_id() == NodeTargetTypeId(ProcessingInstructionNodeTypeId)
} }
} }

View file

@ -25,7 +25,7 @@ pub struct Text {
impl TextDerived for EventTarget { impl TextDerived for EventTarget {
fn is_text(&self) -> bool { fn is_text(&self) -> bool {
self.type_id == NodeTargetTypeId(TextNodeTypeId) *self.type_id() == NodeTargetTypeId(TextNodeTypeId)
} }
} }

View file

@ -680,7 +680,7 @@ impl Reflectable for XMLHttpRequest {
impl XMLHttpRequestDerived for EventTarget { impl XMLHttpRequestDerived for EventTarget {
fn is_xmlhttprequest(&self) -> bool { fn is_xmlhttprequest(&self) -> bool {
match self.type_id { match *self.type_id() {
XMLHttpRequestTargetTypeId(XMLHttpRequestTypeId) => true, XMLHttpRequestTargetTypeId(XMLHttpRequestTypeId) => true,
_ => false _ => false
} }

View file

@ -32,7 +32,7 @@ impl XMLHttpRequestEventTarget {
} }
impl XMLHttpRequestEventTargetDerived for EventTarget { impl XMLHttpRequestEventTargetDerived for EventTarget {
fn is_xmlhttprequesteventtarget(&self) -> bool { fn is_xmlhttprequesteventtarget(&self) -> bool {
match self.type_id { match *self.type_id() {
XMLHttpRequestTargetTypeId(_) => true, XMLHttpRequestTargetTypeId(_) => true,
_ => false _ => false
} }

View file

@ -38,6 +38,6 @@ impl Reflectable for XMLHttpRequestUpload {
impl XMLHttpRequestUploadDerived for EventTarget { impl XMLHttpRequestUploadDerived for EventTarget {
fn is_xmlhttprequestupload(&self) -> bool { fn is_xmlhttprequestupload(&self) -> bool {
self.type_id == XMLHttpRequestTargetTypeId(XMLHttpRequestUploadTypeId) *self.type_id() == XMLHttpRequestTargetTypeId(XMLHttpRequestUploadTypeId)
} }
} }