Privatize EventTarget and EventListenerEntry

servo · Oct 13, 2014 · df60f8b · df60f8b
1 parent ba073d7
commit df60f8b
Show file tree

Hide file tree

Showing 82 changed files with 91 additions and 84 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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))
     }
 }