Privatize Node

servo · Oct 13, 2014 · 28061b1 · 28061b1
1 parent da7590d
commit 28061b1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/components/layout/util.rs b/components/layout/util.rs
@@ -78,20 +78,20 @@ pub trait LayoutDataAccess {
 impl<'ln> LayoutDataAccess for LayoutNode<'ln> {
     #[inline(always)]
     unsafe fn borrow_layout_data_unchecked(&self) -> *const Option<LayoutDataWrapper> {
-        mem::transmute(self.get().layout_data.borrow_unchecked())
+        mem::transmute(self.get().layout_data_unchecked())
     }
 
     #[inline(always)]
     fn borrow_layout_data<'a>(&'a self) -> Ref<'a,Option<LayoutDataWrapper>> {
         unsafe {
-            mem::transmute(self.get().layout_data.borrow())
+            mem::transmute(self.get().layout_data())
         }
     }
 
     #[inline(always)]
     fn mutate_layout_data<'a>(&'a self) -> RefMut<'a,Option<LayoutDataWrapper>> {
         unsafe {
-            mem::transmute(self.get().layout_data.borrow_mut())
+            mem::transmute(self.get().layout_data_mut())
         }
     }
 }

diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
@@ -721,15 +721,15 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
     #[inline(always)]
     pub fn borrow_layout_data<'a>(&'a self) -> Ref<'a,Option<LayoutDataWrapper>> {
         unsafe {
-            mem::transmute(self.get().layout_data.borrow())
+            mem::transmute(self.get().layout_data())
         }
     }
 
     /// Borrows the layout data mutably. Fails on a conflicting borrow.
     #[inline(always)]
     pub fn mutate_layout_data<'a>(&'a self) -> RefMut<'a,Option<LayoutDataWrapper>> {
         unsafe {
-            mem::transmute(self.get().layout_data.borrow_mut())
+            mem::transmute(self.get().layout_data_mut())
         }
     }
 

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
@@ -73,9 +73,10 @@ use uuid;
 /// An HTML node.
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Node {
     /// The JavaScript reflector for this node.
-    pub eventtarget: EventTarget,
+    eventtarget: EventTarget,
 
     /// The type of node that this is.
     type_id: NodeTypeId,
@@ -108,7 +109,7 @@ pub struct Node {
     ///
     /// Must be sent back to the layout task to be destroyed when this
     /// node is finalized.
-    pub layout_data: LayoutDataRef,
+    layout_data: LayoutDataRef,
 
     unique_id: RefCell<String>,
 }
@@ -1149,6 +1150,21 @@ impl Node {
         &self.eventtarget
     }
 
+    #[inline]
+    pub fn layout_data(&self) -> Ref<Option<LayoutData>> {
+        self.layout_data.borrow()
+    }
+
+    #[inline]
+    pub fn layout_data_mut(&self) -> RefMut<Option<LayoutData>> {
+        self.layout_data.borrow_mut()
+    }
+
+    #[inline]
+    pub unsafe fn layout_data_unchecked(&self) -> *const Option<LayoutData> {
+        self.layout_data.borrow_unchecked()
+    }
+
     // http://dom.spec.whatwg.org/#concept-node-adopt
     pub fn adopt(node: JSRef<Node>, document: JSRef<Document>) {
         // Step 1.