Privatize InheritTypes

servo · Oct 13, 2014 · 9a52bb8 · 9a52bb8
1 parent acd98a7
commit 9a52bb8
Show file tree

Hide file tree

Showing 80 changed files with 252 additions and 101 deletions.
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
@@ -116,8 +116,8 @@ pub trait TLayoutNode {
                 fail!("not an iframe element!")
             }
             let iframe_element: JS<HTMLIFrameElement> = self.get_jsmanaged().transmute_copy();
-            let size = (*iframe_element.unsafe_get()).size.get().unwrap();
-            (size.pipeline_id, size.subpage_id)
+            let size = (*iframe_element.unsafe_get()).size().unwrap();
+            (*size.pipeline_id(), *size.subpage_id())
         }
     }
 
@@ -189,7 +189,7 @@ impl<'ln> TLayoutNode for LayoutNode<'ln> {
         unsafe {
             if self.get().is_text() {
                 let text: JS<Text> = self.get_jsmanaged().transmute_copy();
-                (*text.unsafe_get()).characterdata.data.borrow().clone()
+                (*text.unsafe_get()).characterdata().data().clone()
             } else if self.get().is_htmlinputelement() {
                 let input: JS<HTMLInputElement> = self.get_jsmanaged().transmute_copy();
                 input.get_value_for_layout()
@@ -765,7 +765,7 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
             Some(TextNodeTypeId) => {
                 unsafe {
                     let text: JS<Text> = self.get_jsmanaged().transmute_copy();
-                    if !is_whitespace((*text.unsafe_get()).characterdata.data.borrow().as_slice()) {
+                    if !is_whitespace((*text.unsafe_get()).characterdata().data().as_slice()) {
                         return false
                     }
 

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -5452,7 +5452,7 @@ def InheritTypes(config):
                 protoDescriptor = config.getDescriptor(protoName)
                 delegate = string.Template('''impl ${selfName} for ${baseName} {
   fn ${fname}(&self) -> bool {
-    self.${parentName}.${fname}()
+    self.${parentName}().${fname}()
   }
 }
 ''').substitute({'fname': 'is_' + name.lower(),

diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
@@ -14,13 +14,14 @@ use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::node::{CommentNodeTypeId, Node, NodeTypeId, TextNodeTypeId, ProcessingInstructionNodeTypeId, NodeHelpers};
 use servo_util::str::DOMString;
 
-use std::cell::RefCell;
+use std::cell::{Ref, RefCell};
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct CharacterData {
-    pub node: Node,
-    pub data: RefCell<DOMString>,
+    node: Node,
+    data: RefCell<DOMString>,
 }
 
 impl CharacterDataDerived for EventTarget {
@@ -41,6 +42,21 @@ impl CharacterData {
             data: RefCell::new(data),
         }
     }
+
+    #[inline]
+    pub fn node<'a>(&'a self) -> &'a Node {
+        &self.node
+    }
+
+    #[inline]
+    pub fn data(&self) -> Ref<DOMString> {
+        self.data.borrow()
+    }
+
+    #[inline]
+    pub fn set_data(&self, data: DOMString) {
+        *self.data.borrow_mut() = data;
+    }
 }
 
 impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
@@ -641,7 +641,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
                     for child in title_elem.children() {
                         if child.is_text() {
                             let text: JSRef<Text> = TextCast::to_ref(child).unwrap();
-                            title.push_str(text.characterdata.data.borrow().as_slice());
+                            title.push_str(text.characterdata().data().as_slice());
                         }
                     }
                 });

diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
@@ -166,6 +166,11 @@ impl Element {
         Node::reflect_node(box Element::new_inherited(ElementTypeId_, local_name, namespace, prefix, document),
                            document, ElementBinding::Wrap)
     }
+
+    #[inline]
+    pub fn node<'a>(&'a self) -> &'a Node {
+        &self.node
+    }
 }
 
 pub trait RawLayoutElementHelpers {

diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
@@ -23,8 +23,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLAnchorElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLAnchorElementDerived for EventTarget {

diff --git a/components/script/dom/htmlappletelement.rs b/components/script/dom/htmlappletelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLAppletElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLAppletElementDerived for EventTarget {

diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs
@@ -16,8 +16,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLAreaElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLAreaElementDerived for EventTarget {

diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLAudioElement {
-    pub htmlmediaelement: HTMLMediaElement
+    htmlmediaelement: HTMLMediaElement
 }
 
 impl HTMLAudioElementDerived for EventTarget {

diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLBaseElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLBaseElementDerived for EventTarget {

diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
@@ -22,8 +22,9 @@ use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLBodyElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLBodyElementDerived for EventTarget {

diff --git a/components/script/dom/htmlbrelement.rs b/components/script/dom/htmlbrelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLBRElement {
-    pub htmlelement: HTMLElement,
+    htmlelement: HTMLElement,
 }
 
 impl HTMLBRElementDerived for EventTarget {

diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs
@@ -22,8 +22,9 @@ use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLButtonElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLButtonElementDerived for EventTarget {

diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
@@ -30,8 +30,9 @@ static DefaultHeight: u32 = 150;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLCanvasElement {
-    pub htmlelement: HTMLElement,
+    htmlelement: HTMLElement,
     context: MutNullableJS<CanvasRenderingContext2D>,
     width: Cell<u32>,
     height: Cell<u32>,

diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/htmldataelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLDataElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLDataElementDerived for EventTarget {

diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs
@@ -18,8 +18,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLDataListElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLDataListElementDerived for EventTarget {

diff --git a/components/script/dom/htmldirectoryelement.rs b/components/script/dom/htmldirectoryelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLDirectoryElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLDirectoryElementDerived for EventTarget {

diff --git a/components/script/dom/htmldivelement.rs b/components/script/dom/htmldivelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLDivElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLDivElementDerived for EventTarget {

diff --git a/components/script/dom/htmldlistelement.rs b/components/script/dom/htmldlistelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLDListElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLDListElementDerived for EventTarget {

diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
@@ -22,8 +22,9 @@ use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLElement {
-    pub element: Element
+    element: Element
 }
 
 impl HTMLElementDerived for EventTarget {
@@ -48,6 +49,11 @@ impl HTMLElement {
         let element = HTMLElement::new_inherited(HTMLElementTypeId, localName, prefix, document);
         Node::reflect_node(box element, document, HTMLElementBinding::Wrap)
     }
+
+    #[inline]
+    pub fn element<'a>(&'a self) -> &'a Element {
+        &self.element
+    }
 }
 
 trait PrivateHTMLElementHelpers {

diff --git a/components/script/dom/htmlembedelement.rs b/components/script/dom/htmlembedelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLEmbedElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLEmbedElementDerived for EventTarget {

diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs
@@ -23,8 +23,9 @@ use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLFieldSetElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLFieldSetElementDerived for EventTarget {

diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLFontElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLFontElementDerived for EventTarget {

diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
@@ -31,8 +31,9 @@ use url::form_urlencoded::serialize;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLFormElement {
-    pub htmlelement: HTMLElement,
+    htmlelement: HTMLElement,
 }
 
 impl HTMLFormElementDerived for EventTarget {

diff --git a/components/script/dom/htmlframeelement.rs b/components/script/dom/htmlframeelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLFrameElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLFrameElementDerived for EventTarget {

diff --git a/components/script/dom/htmlframesetelement.rs b/components/script/dom/htmlframesetelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLFrameSetElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLFrameSetElementDerived for EventTarget {

diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLHeadElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLHeadElementDerived for EventTarget {

diff --git a/components/script/dom/htmlheadingelement.rs b/components/script/dom/htmlheadingelement.rs
@@ -25,9 +25,10 @@ pub enum HeadingLevel {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLHeadingElement {
-    pub htmlelement: HTMLElement,
-    pub level: HeadingLevel,
+    htmlelement: HTMLElement,
+    level: HeadingLevel,
 }
 
 impl HTMLHeadingElementDerived for EventTarget {

diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLHRElement {
-    pub htmlelement: HTMLElement,
+    htmlelement: HTMLElement,
 }
 
 impl HTMLHRElementDerived for EventTarget {

diff --git a/components/script/dom/htmlhtmlelement.rs b/components/script/dom/htmlhtmlelement.rs
@@ -15,8 +15,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLHtmlElement {
-    pub htmlelement: HTMLElement
+    htmlelement: HTMLElement
 }
 
 impl HTMLHtmlElementDerived for EventTarget {