diff options
82 files changed, 91 insertions, 84 deletions
diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index c9ad75f9a22..8201965bdb3 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -26,7 +26,7 @@ pub struct CharacterData { impl CharacterDataDerived for EventTarget { fn is_characterdata(&self) -> bool { - match self.type_id { + match *self.type_id() { NodeTargetTypeId(TextNodeTypeId) | NodeTargetTypeId(CommentNodeTypeId) | NodeTargetTypeId(ProcessingInstructionNodeTypeId) => true, diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs index 335b9744138..8da33dab01f 100644 --- a/components/script/dom/comment.rs +++ b/components/script/dom/comment.rs @@ -25,7 +25,7 @@ pub struct Comment { impl CommentDerived for EventTarget { fn is_comment(&self) -> bool { - self.type_id == NodeTargetTypeId(CommentNodeTypeId) + *self.type_id() == NodeTargetTypeId(CommentNodeTypeId) } } diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 2d98b4819a5..22e5c4c6454 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -193,7 +193,7 @@ impl Reflectable for DedicatedWorkerGlobalScope { impl DedicatedWorkerGlobalScopeDerived for EventTarget { fn is_dedicatedworkerglobalscope(&self) -> bool { - match self.type_id { + match *self.type_id() { WorkerGlobalScopeTypeId(DedicatedGlobalScope) => true, _ => false } diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 7e698a9ec6a..c67604942da 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -98,7 +98,7 @@ pub struct Document { impl DocumentDerived for EventTarget { fn is_document(&self) -> bool { - self.type_id == NodeTargetTypeId(DocumentNodeTypeId) + *self.type_id() == NodeTargetTypeId(DocumentNodeTypeId) } } diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index ebbb3d0fe0d..8b3b8e6bba6 100644 --- a/components/script/dom/documentfragment.rs +++ b/components/script/dom/documentfragment.rs @@ -27,7 +27,7 @@ pub struct DocumentFragment { impl DocumentFragmentDerived for EventTarget { fn is_documentfragment(&self) -> bool { - self.type_id == NodeTargetTypeId(DocumentFragmentNodeTypeId) + *self.type_id() == NodeTargetTypeId(DocumentFragmentNodeTypeId) } } diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs index 6983e6eb19b..683b1c56ae0 100644 --- a/components/script/dom/documenttype.rs +++ b/components/script/dom/documenttype.rs @@ -25,7 +25,7 @@ pub struct DocumentType { impl DocumentTypeDerived for EventTarget { fn is_documenttype(&self) -> bool { - self.type_id == NodeTargetTypeId(DoctypeNodeTypeId) + *self.type_id() == NodeTargetTypeId(DoctypeNodeTypeId) } } diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index a00fd1e9945..580b79276a6 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -57,7 +57,7 @@ pub struct Element { impl ElementDerived for EventTarget { fn is_element(&self) -> bool { - match self.type_id { + match *self.type_id() { NodeTargetTypeId(ElementNodeTypeId(_)) => true, _ => false } diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index bb6c8000426..d2bb567c8ca 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -59,15 +59,17 @@ impl EventListenerType { #[deriving(PartialEq)] #[jstraceable] +#[privatize] pub struct EventListenerEntry { - pub phase: ListenerPhase, - pub listener: EventListenerType + phase: ListenerPhase, + listener: EventListenerType } #[jstraceable] #[must_root] +#[privatize] pub struct EventTarget { - pub type_id: EventTargetTypeId, + type_id: EventTargetTypeId, reflector_: Reflector, handlers: RefCell<HashMap<DOMString, Vec<EventListenerEntry>>>, } @@ -94,6 +96,11 @@ impl EventTarget { filtered.map(|entry| entry.listener.get_listener()).collect() }) } + + #[inline] + pub fn type_id<'a>(&'a self) -> &'a EventTargetTypeId { + &self.type_id + } } pub trait EventTargetHelpers { diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index f82027a93fa..19492ef6264 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -30,7 +30,7 @@ pub struct HTMLAnchorElement { impl HTMLAnchorElementDerived for EventTarget { fn is_htmlanchorelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAnchorElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAnchorElementTypeId)) } } diff --git a/components/script/dom/htmlappletelement.rs b/components/script/dom/htmlappletelement.rs index 5572b126634..eeb7eb35188 100644 --- a/components/script/dom/htmlappletelement.rs +++ b/components/script/dom/htmlappletelement.rs @@ -22,7 +22,7 @@ pub struct HTMLAppletElement { impl HTMLAppletElementDerived for EventTarget { fn is_htmlappletelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAppletElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAppletElementTypeId)) } } diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index 49463f86b3f..c4272fde753 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/components/script/dom/htmlareaelement.rs @@ -23,7 +23,7 @@ pub struct HTMLAreaElement { impl HTMLAreaElementDerived for EventTarget { fn is_htmlareaelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAreaElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAreaElementTypeId)) } } diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs index b281c6e3db7..9eed3b6c1db 100644 --- a/components/script/dom/htmlaudioelement.rs +++ b/components/script/dom/htmlaudioelement.rs @@ -22,7 +22,7 @@ pub struct HTMLAudioElement { impl HTMLAudioElementDerived for EventTarget { fn is_htmlaudioelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) } } diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs index 6691c27e29c..7bf12bb0822 100644 --- a/components/script/dom/htmlbaseelement.rs +++ b/components/script/dom/htmlbaseelement.rs @@ -22,7 +22,7 @@ pub struct HTMLBaseElement { impl HTMLBaseElementDerived for EventTarget { fn is_htmlbaseelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBaseElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLBaseElementTypeId)) } } diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index a537ca52ba3..7c0c0c17711 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -29,7 +29,7 @@ pub struct HTMLBodyElement { impl HTMLBodyElementDerived for EventTarget { fn is_htmlbodyelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBodyElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLBodyElementTypeId)) } } diff --git a/components/script/dom/htmlbrelement.rs b/components/script/dom/htmlbrelement.rs index e6cb0596bd5..74811afe074 100644 --- a/components/script/dom/htmlbrelement.rs +++ b/components/script/dom/htmlbrelement.rs @@ -22,7 +22,7 @@ pub struct HTMLBRElement { impl HTMLBRElementDerived for EventTarget { fn is_htmlbrelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBRElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLBRElementTypeId)) } } diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index e0ae3afa30a..af4dec6dcb3 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -29,7 +29,7 @@ pub struct HTMLButtonElement { impl HTMLButtonElementDerived for EventTarget { fn is_htmlbuttonelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLButtonElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLButtonElementTypeId)) } } diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index d77657ed2df..ac5a5d7ded5 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -40,7 +40,7 @@ pub struct HTMLCanvasElement { impl HTMLCanvasElementDerived for EventTarget { fn is_htmlcanvaselement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLCanvasElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLCanvasElementTypeId)) } } diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/htmldataelement.rs index bae4916393b..58e2ad90f73 100644 --- a/components/script/dom/htmldataelement.rs +++ b/components/script/dom/htmldataelement.rs @@ -22,7 +22,7 @@ pub struct HTMLDataElement { impl HTMLDataElementDerived for EventTarget { fn is_htmldataelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDataElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDataElementTypeId)) } } diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index a61299b560b..3363997142b 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/components/script/dom/htmldatalistelement.rs @@ -25,7 +25,7 @@ pub struct HTMLDataListElement { impl HTMLDataListElementDerived for EventTarget { fn is_htmldatalistelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDataListElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDataListElementTypeId)) } } diff --git a/components/script/dom/htmldirectoryelement.rs b/components/script/dom/htmldirectoryelement.rs index 72553bf2a5e..f1cd840e298 100644 --- a/components/script/dom/htmldirectoryelement.rs +++ b/components/script/dom/htmldirectoryelement.rs @@ -22,7 +22,7 @@ pub struct HTMLDirectoryElement { impl HTMLDirectoryElementDerived for EventTarget { fn is_htmldirectoryelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDirectoryElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDirectoryElementTypeId)) } } diff --git a/components/script/dom/htmldivelement.rs b/components/script/dom/htmldivelement.rs index cbbcd90c222..d35ad9dc4be 100644 --- a/components/script/dom/htmldivelement.rs +++ b/components/script/dom/htmldivelement.rs @@ -22,7 +22,7 @@ pub struct HTMLDivElement { impl HTMLDivElementDerived for EventTarget { fn is_htmldivelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDivElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDivElementTypeId)) } } diff --git a/components/script/dom/htmldlistelement.rs b/components/script/dom/htmldlistelement.rs index 983721ac429..643f7e81263 100644 --- a/components/script/dom/htmldlistelement.rs +++ b/components/script/dom/htmldlistelement.rs @@ -22,7 +22,7 @@ pub struct HTMLDListElement { impl HTMLDListElementDerived for EventTarget { fn is_htmldlistelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDListElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLDListElementTypeId)) } } diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index cc920a50c42..00ea736a07f 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -29,7 +29,7 @@ pub struct HTMLElement { impl HTMLElementDerived for EventTarget { fn is_htmlelement(&self) -> bool { - match self.type_id { + match *self.type_id() { NodeTargetTypeId(ElementNodeTypeId(ElementTypeId_)) => false, NodeTargetTypeId(ElementNodeTypeId(_)) => true, _ => false diff --git a/components/script/dom/htmlembedelement.rs b/components/script/dom/htmlembedelement.rs index 1860a3027f2..e8de6bbd08a 100644 --- a/components/script/dom/htmlembedelement.rs +++ b/components/script/dom/htmlembedelement.rs @@ -22,7 +22,7 @@ pub struct HTMLEmbedElement { impl HTMLEmbedElementDerived for EventTarget { fn is_htmlembedelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLEmbedElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLEmbedElementTypeId)) } } diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index 6e59a2456e1..6f0d2695897 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -30,7 +30,7 @@ pub struct HTMLFieldSetElement { impl HTMLFieldSetElementDerived for EventTarget { fn is_htmlfieldsetelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFieldSetElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFieldSetElementTypeId)) } } diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index bd4cf31b33c..5f11a672cc4 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/components/script/dom/htmlfontelement.rs @@ -22,7 +22,7 @@ pub struct HTMLFontElement { impl HTMLFontElementDerived for EventTarget { fn is_htmlfontelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFontElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFontElementTypeId)) } } diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 55a8ecf0190..825805703e4 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -38,7 +38,7 @@ pub struct HTMLFormElement { impl HTMLFormElementDerived for EventTarget { fn is_htmlformelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFormElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFormElementTypeId)) } } diff --git a/components/script/dom/htmlframeelement.rs b/components/script/dom/htmlframeelement.rs index 0f517ef7615..76a8b190cb1 100644 --- a/components/script/dom/htmlframeelement.rs +++ b/components/script/dom/htmlframeelement.rs @@ -22,7 +22,7 @@ pub struct HTMLFrameElement { impl HTMLFrameElementDerived for EventTarget { fn is_htmlframeelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameElementTypeId)) } } diff --git a/components/script/dom/htmlframesetelement.rs b/components/script/dom/htmlframesetelement.rs index 70ac2eb58e7..168ab8f73ec 100644 --- a/components/script/dom/htmlframesetelement.rs +++ b/components/script/dom/htmlframesetelement.rs @@ -22,7 +22,7 @@ pub struct HTMLFrameSetElement { impl HTMLFrameSetElementDerived for EventTarget { fn is_htmlframesetelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameSetElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameSetElementTypeId)) } } diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs index b1031def2c6..51cbf9f9b88 100644 --- a/components/script/dom/htmlheadelement.rs +++ b/components/script/dom/htmlheadelement.rs @@ -22,7 +22,7 @@ pub struct HTMLHeadElement { impl HTMLHeadElementDerived for EventTarget { fn is_htmlheadelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadElementTypeId)) } } diff --git a/components/script/dom/htmlheadingelement.rs b/components/script/dom/htmlheadingelement.rs index 51df3db00c3..1f91a89abee 100644 --- a/components/script/dom/htmlheadingelement.rs +++ b/components/script/dom/htmlheadingelement.rs @@ -33,7 +33,7 @@ pub struct HTMLHeadingElement { impl HTMLHeadingElementDerived for EventTarget { fn is_htmlheadingelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadingElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadingElementTypeId)) } } diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs index e132835f499..95400b2713d 100644 --- a/components/script/dom/htmlhrelement.rs +++ b/components/script/dom/htmlhrelement.rs @@ -22,7 +22,7 @@ pub struct HTMLHRElement { impl HTMLHRElementDerived for EventTarget { fn is_htmlhrelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHRElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHRElementTypeId)) } } diff --git a/components/script/dom/htmlhtmlelement.rs b/components/script/dom/htmlhtmlelement.rs index bacc8d39650..f3cd408a31d 100644 --- a/components/script/dom/htmlhtmlelement.rs +++ b/components/script/dom/htmlhtmlelement.rs @@ -22,7 +22,7 @@ pub struct HTMLHtmlElement { impl HTMLHtmlElementDerived for EventTarget { fn is_htmlhtmlelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHtmlElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLHtmlElementTypeId)) } } diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 68ca275682f..90edb8201c1 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -50,7 +50,7 @@ pub struct HTMLIFrameElement { impl HTMLIFrameElementDerived for EventTarget { fn is_htmliframeelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId)) } } diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 5d7ffeb3c22..e9c916e2eec 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -34,7 +34,7 @@ pub struct HTMLImageElement { impl HTMLImageElementDerived for EventTarget { fn is_htmlimageelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLImageElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLImageElementTypeId)) } } diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 1e95e718d49..b63fee7917b 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -57,7 +57,7 @@ pub struct HTMLInputElement { impl HTMLInputElementDerived for EventTarget { fn is_htmlinputelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLInputElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLInputElementTypeId)) } } diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs index 2b4b9aa2da9..59fe5479f53 100644 --- a/components/script/dom/htmllabelelement.rs +++ b/components/script/dom/htmllabelelement.rs @@ -22,7 +22,7 @@ pub struct HTMLLabelElement { impl HTMLLabelElementDerived for EventTarget { fn is_htmllabelelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLabelElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLabelElementTypeId)) } } diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/htmllegendelement.rs index f5e53167934..2d4725528ab 100644 --- a/components/script/dom/htmllegendelement.rs +++ b/components/script/dom/htmllegendelement.rs @@ -22,7 +22,7 @@ pub struct HTMLLegendElement { impl HTMLLegendElementDerived for EventTarget { fn is_htmllegendelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLegendElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLegendElementTypeId)) } } diff --git a/components/script/dom/htmllielement.rs b/components/script/dom/htmllielement.rs index 6300d028235..f4d789ec549 100644 --- a/components/script/dom/htmllielement.rs +++ b/components/script/dom/htmllielement.rs @@ -22,7 +22,7 @@ pub struct HTMLLIElement { impl HTMLLIElementDerived for EventTarget { fn is_htmllielement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLIElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLIElementTypeId)) } } diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index eaaa72d86f3..1c641562d81 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -30,7 +30,7 @@ pub struct HTMLLinkElement { impl HTMLLinkElementDerived for EventTarget { fn is_htmllinkelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLinkElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLLinkElementTypeId)) } } diff --git a/components/script/dom/htmlmapelement.rs b/components/script/dom/htmlmapelement.rs index 99a2593801a..0cca9e14a84 100644 --- a/components/script/dom/htmlmapelement.rs +++ b/components/script/dom/htmlmapelement.rs @@ -22,7 +22,7 @@ pub struct HTMLMapElement { impl HTMLMapElementDerived for EventTarget { fn is_htmlmapelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMapElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLMapElementTypeId)) } } diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 4141d7df79c..54ff9308672 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -21,7 +21,7 @@ pub struct HTMLMediaElement { impl HTMLMediaElementDerived for EventTarget { fn is_htmlmediaelement(&self) -> bool { - match self.type_id { + match *self.type_id() { NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) | NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) => true, _ => false diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 7f01d7c0ef4..4a38ebfbc3a 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -22,7 +22,7 @@ pub struct HTMLMetaElement { impl HTMLMetaElementDerived for EventTarget { fn is_htmlmetaelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMetaElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLMetaElementTypeId)) } } diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/htmlmeterelement.rs index 045d6fb513c..76e2f9400d0 100644 --- a/components/script/dom/htmlmeterelement.rs +++ b/components/script/dom/htmlmeterelement.rs @@ -22,7 +22,7 @@ pub struct HTMLMeterElement { impl HTMLMeterElementDerived for EventTarget { fn is_htmlmeterelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMeterElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLMeterElementTypeId)) } } diff --git a/components/script/dom/htmlmodelement.rs b/components/script/dom/htmlmodelement.rs index a71ee89c168..0fa5e2e0cd2 100644 --- a/components/script/dom/htmlmodelement.rs +++ b/components/script/dom/htmlmodelement.rs @@ -22,7 +22,7 @@ pub struct HTMLModElement { impl HTMLModElementDerived for EventTarget { fn is_htmlmodelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLModElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLModElementTypeId)) } } diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index bc61e468045..b059257830f 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -34,7 +34,7 @@ pub struct HTMLObjectElement { impl HTMLObjectElementDerived for EventTarget { fn is_htmlobjectelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLObjectElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLObjectElementTypeId)) } } diff --git a/components/script/dom/htmlolistelement.rs b/components/script/dom/htmlolistelement.rs index 58f73fed5d6..82c67341c31 100644 --- a/components/script/dom/htmlolistelement.rs +++ b/components/script/dom/htmlolistelement.rs @@ -22,7 +22,7 @@ pub struct HTMLOListElement { impl HTMLOListElementDerived for EventTarget { fn is_htmlolistelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOListElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOListElementTypeId)) } } diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index e94ea81f9b4..e7fe66c2e0d 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -27,7 +27,7 @@ pub struct HTMLOptGroupElement { impl HTMLOptGroupElementDerived for EventTarget { fn is_htmloptgroupelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOptGroupElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOptGroupElementTypeId)) } } diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index 8c1c5b0989e..715f0d6f1f5 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -31,7 +31,7 @@ pub struct HTMLOptionElement { impl HTMLOptionElementDerived for EventTarget { fn is_htmloptionelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOptionElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOptionElementTypeId)) } } diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs index ec5622c59ac..0b9f0b0d872 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/components/script/dom/htmloutputelement.rs @@ -24,7 +24,7 @@ pub struct HTMLOutputElement { impl HTMLOutputElementDerived for EventTarget { fn is_htmloutputelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOutputElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLOutputElementTypeId)) } } diff --git a/components/script/dom/htmlparagraphelement.rs b/components/script/dom/htmlparagraphelement.rs index 4a0976c2ff1..66a70b6963f 100644 --- a/components/script/dom/htmlparagraphelement.rs +++ b/components/script/dom/htmlparagraphelement.rs @@ -22,7 +22,7 @@ pub struct HTMLParagraphElement { impl HTMLParagraphElementDerived for EventTarget { fn is_htmlparagraphelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLParagraphElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLParagraphElementTypeId)) } } diff --git a/components/script/dom/htmlparamelement.rs b/components/script/dom/htmlparamelement.rs index f729242b879..7845a767512 100644 --- a/components/script/dom/htmlparamelement.rs +++ b/components/script/dom/htmlparamelement.rs @@ -22,7 +22,7 @@ pub struct HTMLParamElement { impl HTMLParamElementDerived for EventTarget { fn is_htmlparamelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLParamElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLParamElementTypeId)) } } diff --git a/components/script/dom/htmlpreelement.rs b/components/script/dom/htmlpreelement.rs index 22bd185804c..89799212226 100644 --- a/components/script/dom/htmlpreelement.rs +++ b/components/script/dom/htmlpreelement.rs @@ -22,7 +22,7 @@ pub struct HTMLPreElement { impl HTMLPreElementDerived for EventTarget { fn is_htmlpreelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLPreElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLPreElementTypeId)) } } diff --git a/components/script/dom/htmlprogresselement.rs b/components/script/dom/htmlprogresselement.rs index 879e86cb6fa..65db0e536af 100644 --- a/components/script/dom/htmlprogresselement.rs +++ b/components/script/dom/htmlprogresselement.rs @@ -22,7 +22,7 @@ pub struct HTMLProgressElement { impl HTMLProgressElementDerived for EventTarget { fn is_htmlprogresselement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLProgressElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLProgressElementTypeId)) } } diff --git a/components/script/dom/htmlquoteelement.rs b/components/script/dom/htmlquoteelement.rs index ed5b8f818ce..f028b3d9c5d 100644 --- a/components/script/dom/htmlquoteelement.rs +++ b/components/script/dom/htmlquoteelement.rs @@ -22,7 +22,7 @@ pub struct HTMLQuoteElement { impl HTMLQuoteElementDerived for EventTarget { fn is_htmlquoteelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLQuoteElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLQuoteElementTypeId)) } } diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 0168bc8ad98..138c7ea8679 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -27,7 +27,7 @@ pub struct HTMLScriptElement { impl HTMLScriptElementDerived for EventTarget { fn is_htmlscriptelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLScriptElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLScriptElementTypeId)) } } diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 01c9e1c2348..d825bf1f3a1 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -30,7 +30,7 @@ pub struct HTMLSelectElement { impl HTMLSelectElementDerived for EventTarget { fn is_htmlselectelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSelectElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLSelectElementTypeId)) } } diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/htmlsourceelement.rs index 587262ebf3f..8a7578febdf 100644 --- a/components/script/dom/htmlsourceelement.rs +++ b/components/script/dom/htmlsourceelement.rs @@ -22,7 +22,7 @@ pub struct HTMLSourceElement { impl HTMLSourceElementDerived for EventTarget { fn is_htmlsourceelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSourceElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLSourceElementTypeId)) } } diff --git a/components/script/dom/htmlspanelement.rs b/components/script/dom/htmlspanelement.rs index 2dea84ed3c6..fba53a8b795 100644 --- a/components/script/dom/htmlspanelement.rs +++ b/components/script/dom/htmlspanelement.rs @@ -22,7 +22,7 @@ pub struct HTMLSpanElement { impl HTMLSpanElementDerived for EventTarget { fn is_htmlspanelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSpanElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLSpanElementTypeId)) } } diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index cf0a19243b4..46c631fc730 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -26,7 +26,7 @@ pub struct HTMLStyleElement { impl HTMLStyleElementDerived for EventTarget { fn is_htmlstyleelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLStyleElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLStyleElementTypeId)) } } diff --git a/components/script/dom/htmltablecaptionelement.rs b/components/script/dom/htmltablecaptionelement.rs index 01f7d3a5731..e1ecf1914ce 100644 --- a/components/script/dom/htmltablecaptionelement.rs +++ b/components/script/dom/htmltablecaptionelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTableCaptionElement { impl HTMLTableCaptionElementDerived for EventTarget { fn is_htmltablecaptionelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableCaptionElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableCaptionElementTypeId)) } } diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs index 97d85976614..95bcebf5480 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/components/script/dom/htmltablecellelement.rs @@ -21,7 +21,7 @@ pub struct HTMLTableCellElement { impl HTMLTableCellElementDerived for EventTarget { fn is_htmltablecellelement(&self) -> bool { - match self.type_id { + match *self.type_id() { NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) | NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) => true, _ => false diff --git a/components/script/dom/htmltablecolelement.rs b/components/script/dom/htmltablecolelement.rs index 9954bc1b09b..03caf0e22b8 100644 --- a/components/script/dom/htmltablecolelement.rs +++ b/components/script/dom/htmltablecolelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTableColElement { impl HTMLTableColElementDerived for EventTarget { fn is_htmltablecolelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableColElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableColElementTypeId)) } } diff --git a/components/script/dom/htmltabledatacellelement.rs b/components/script/dom/htmltabledatacellelement.rs index f4024581a49..11b8b117a2c 100644 --- a/components/script/dom/htmltabledatacellelement.rs +++ b/components/script/dom/htmltabledatacellelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTableDataCellElement { impl HTMLTableDataCellElementDerived for EventTarget { fn is_htmltabledatacellelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) } } diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index 8faa3c573ad..e33a44cdd58 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -26,7 +26,7 @@ pub struct HTMLTableElement { impl HTMLTableElementDerived for EventTarget { fn is_htmltableelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableElementTypeId)) } } diff --git a/components/script/dom/htmltableheadercellelement.rs b/components/script/dom/htmltableheadercellelement.rs index 65db1e2c500..eae776a6903 100644 --- a/components/script/dom/htmltableheadercellelement.rs +++ b/components/script/dom/htmltableheadercellelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTableHeaderCellElement { impl HTMLTableHeaderCellElementDerived for EventTarget { fn is_htmltableheadercellelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) } } diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs index 3552147fd96..45f1f06fe28 100644 --- a/components/script/dom/htmltablerowelement.rs +++ b/components/script/dom/htmltablerowelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTableRowElement { impl HTMLTableRowElementDerived for EventTarget { fn is_htmltablerowelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableRowElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableRowElementTypeId)) } } diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs index a4d9f3ad91b..f4a26c709ec 100644 --- a/components/script/dom/htmltablesectionelement.rs +++ b/components/script/dom/htmltablesectionelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTableSectionElement { impl HTMLTableSectionElementDerived for EventTarget { fn is_htmltablesectionelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableSectionElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTableSectionElementTypeId)) } } diff --git a/components/script/dom/htmltemplateelement.rs b/components/script/dom/htmltemplateelement.rs index dcb4812c5dc..9e959937ec6 100644 --- a/components/script/dom/htmltemplateelement.rs +++ b/components/script/dom/htmltemplateelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTemplateElement { impl HTMLTemplateElementDerived for EventTarget { fn is_htmltemplateelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTemplateElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTemplateElementTypeId)) } } diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 19a59a899e4..37fd0544f4f 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -27,7 +27,7 @@ pub struct HTMLTextAreaElement { impl HTMLTextAreaElementDerived for EventTarget { fn is_htmltextareaelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTextAreaElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTextAreaElementTypeId)) } } diff --git a/components/script/dom/htmltimeelement.rs b/components/script/dom/htmltimeelement.rs index be8dafbcfef..4cf70e20214 100644 --- a/components/script/dom/htmltimeelement.rs +++ b/components/script/dom/htmltimeelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTimeElement { impl HTMLTimeElementDerived for EventTarget { fn is_htmltimeelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTimeElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTimeElementTypeId)) } } diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index 22b3a731002..5e7d8fbd1b3 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -25,7 +25,7 @@ pub struct HTMLTitleElement { impl HTMLTitleElementDerived for EventTarget { fn is_htmltitleelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTitleElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTitleElementTypeId)) } } diff --git a/components/script/dom/htmltrackelement.rs b/components/script/dom/htmltrackelement.rs index d73007310a6..f1ae254b365 100644 --- a/components/script/dom/htmltrackelement.rs +++ b/components/script/dom/htmltrackelement.rs @@ -22,7 +22,7 @@ pub struct HTMLTrackElement { impl HTMLTrackElementDerived for EventTarget { fn is_htmltrackelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTrackElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLTrackElementTypeId)) } } diff --git a/components/script/dom/htmlulistelement.rs b/components/script/dom/htmlulistelement.rs index b23b979c05c..bd417aef8ca 100644 --- a/components/script/dom/htmlulistelement.rs +++ b/components/script/dom/htmlulistelement.rs @@ -22,7 +22,7 @@ pub struct HTMLUListElement { impl HTMLUListElementDerived for EventTarget { fn is_htmlulistelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLUListElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLUListElementTypeId)) } } diff --git a/components/script/dom/htmlunknownelement.rs b/components/script/dom/htmlunknownelement.rs index 15329bd453f..1194346baa9 100644 --- a/components/script/dom/htmlunknownelement.rs +++ b/components/script/dom/htmlunknownelement.rs @@ -22,7 +22,7 @@ pub struct HTMLUnknownElement { impl HTMLUnknownElementDerived for EventTarget { fn is_htmlunknownelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLUnknownElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLUnknownElementTypeId)) } } diff --git a/components/script/dom/htmlvideoelement.rs b/components/script/dom/htmlvideoelement.rs index c7626fc1987..6e7080aca68 100644 --- a/components/script/dom/htmlvideoelement.rs +++ b/components/script/dom/htmlvideoelement.rs @@ -22,7 +22,7 @@ pub struct HTMLVideoElement { impl HTMLVideoElementDerived for EventTarget { fn is_htmlvideoelement(&self) -> bool { - self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) + *self.type_id() == NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) } } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 8ff8b29eca6..8a2179a0760 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -115,7 +115,7 @@ pub struct Node { impl NodeDerived for EventTarget { fn is_node(&self) -> bool { - match self.type_id { + match *self.type_id() { NodeTargetTypeId(_) => true, _ => false } diff --git a/components/script/dom/processinginstruction.rs b/components/script/dom/processinginstruction.rs index dc6631ad34e..ed5c9522aa0 100644 --- a/components/script/dom/processinginstruction.rs +++ b/components/script/dom/processinginstruction.rs @@ -23,7 +23,7 @@ pub struct ProcessingInstruction { impl ProcessingInstructionDerived for EventTarget { fn is_processinginstruction(&self) -> bool { - self.type_id == NodeTargetTypeId(ProcessingInstructionNodeTypeId) + *self.type_id() == NodeTargetTypeId(ProcessingInstructionNodeTypeId) } } diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs index 7e251fd0b99..b8fea7c23cb 100644 --- a/components/script/dom/text.rs +++ b/components/script/dom/text.rs @@ -25,7 +25,7 @@ pub struct Text { impl TextDerived for EventTarget { fn is_text(&self) -> bool { - self.type_id == NodeTargetTypeId(TextNodeTypeId) + *self.type_id() == NodeTargetTypeId(TextNodeTypeId) } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 37afac6e1b6..e1b026699e8 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -680,7 +680,7 @@ impl Reflectable for XMLHttpRequest { impl XMLHttpRequestDerived for EventTarget { fn is_xmlhttprequest(&self) -> bool { - match self.type_id { + match *self.type_id() { XMLHttpRequestTargetTypeId(XMLHttpRequestTypeId) => true, _ => false } diff --git a/components/script/dom/xmlhttprequesteventtarget.rs b/components/script/dom/xmlhttprequesteventtarget.rs index 1b0954daf32..0b9c9e7a75f 100644 --- a/components/script/dom/xmlhttprequesteventtarget.rs +++ b/components/script/dom/xmlhttprequesteventtarget.rs @@ -32,7 +32,7 @@ impl XMLHttpRequestEventTarget { } impl XMLHttpRequestEventTargetDerived for EventTarget { fn is_xmlhttprequesteventtarget(&self) -> bool { - match self.type_id { + match *self.type_id() { XMLHttpRequestTargetTypeId(_) => true, _ => false } diff --git a/components/script/dom/xmlhttprequestupload.rs b/components/script/dom/xmlhttprequestupload.rs index cc686696534..7e11df328a8 100644 --- a/components/script/dom/xmlhttprequestupload.rs +++ b/components/script/dom/xmlhttprequestupload.rs @@ -38,6 +38,6 @@ impl Reflectable for XMLHttpRequestUpload { impl XMLHttpRequestUploadDerived for EventTarget { fn is_xmlhttprequestupload(&self) -> bool { - self.type_id == XMLHttpRequestTargetTypeId(XMLHttpRequestUploadTypeId) + *self.type_id() == XMLHttpRequestTargetTypeId(XMLHttpRequestUploadTypeId) } } |