Simple privatizations

components/script/dom/blob.rs

@@ -17,6 +17,7 @@ pub enum BlobType {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Blob {
     reflector_: Reflector,
     type_: BlobType

components/script/dom/browsercontext.rs

@@ -15,6 +15,7 @@ use std::ptr;
 
 #[allow(raw_pointer_deriving)]
 #[jstraceable]
+#[privatize]
 pub struct BrowserContext {
     history: Vec<SessionHistoryEntry>,
     active_index: uint,
@@ -66,6 +67,7 @@ impl BrowserContext {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct SessionHistoryEntry {
     document: JS<Document>,
     children: Vec<BrowserContext>

components/script/dom/canvasrenderingcontext2d.rs

@@ -17,6 +17,7 @@ use canvas::canvas_render_task::{CanvasMsg, CanvasRenderTask, ClearRect, Close,
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct CanvasRenderingContext2D {
     reflector_: Reflector,
     global: GlobalField,

components/script/dom/console.rs

@@ -11,8 +11,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Console {
-    pub reflector_: Reflector
+    reflector_: Reflector
 }
 
 impl Console {

components/script/dom/customevent.rs

@@ -19,6 +19,7 @@ use std::cell::Cell;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct CustomEvent {
     event: Event,
     detail: Cell<JSVal>,

components/script/dom/dedicatedworkerglobalscope.rs

@@ -37,6 +37,7 @@ use url::Url;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DedicatedWorkerGlobalScope {
     workerglobalscope: WorkerGlobalScope,
     receiver: Receiver<ScriptMsg>,

components/script/dom/documentfragment.rs

@@ -20,8 +20,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DocumentFragment {
-    pub node: Node,
+    node: Node,
 }
 
 impl DocumentFragmentDerived for EventTarget {

components/script/dom/domexception.rs

@@ -62,9 +62,10 @@ impl DOMErrorName {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DOMException {
-    pub code: DOMErrorName,
+    code: DOMErrorName,
-    pub reflector_: Reflector
+    reflector_: Reflector
 }
 
 impl DOMException {

components/script/dom/domimplementation.rs

@@ -24,6 +24,7 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DOMImplementation {
     document: JS<Document>,
     reflector_: Reflector,

components/script/dom/domparser.rs

@@ -16,6 +16,7 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DOMParser {
     window: JS<Window>, //XXXjdm Document instead?
     reflector_: Reflector

components/script/dom/domrect.rs

@@ -12,6 +12,7 @@ use servo_util::geometry::Au;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DOMRect {
     reflector_: Reflector,
     top: f32,

components/script/dom/domrectlist.rs

@@ -12,6 +12,7 @@ use dom::window::Window;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DOMRectList {
     reflector_: Reflector,
     rects: Vec<JS<DOMRect>>,

components/script/dom/domtokenlist.rs

@@ -17,6 +17,7 @@ use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct DOMTokenList {
     reflector_: Reflector,
     element: JS<Element>,

components/script/dom/formdata.rs

@@ -27,6 +27,7 @@ pub enum FormDatum {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct FormData {
     data: RefCell<HashMap<DOMString, Vec<FormDatum>>>,
     reflector_: Reflector,

components/script/dom/htmlcollection.rs

@@ -31,6 +31,7 @@ pub enum CollectionTypeId {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct HTMLCollection {
     collection: CollectionTypeId,
     reflector_: Reflector,

components/script/dom/location.rs

@@ -17,6 +17,7 @@ use std::rc::Rc;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Location {
     reflector_: Reflector, //XXXjdm cycle: window->Location->window
     page: Rc<Page>,

components/script/dom/messageevent.rs

@@ -20,6 +20,7 @@ use js::jsval::JSVal;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct MessageEvent {
     event: Event,
     data: JSVal,

components/script/dom/mouseevent.rs

@@ -21,18 +21,19 @@ use std::default::Default;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct MouseEvent {
-    pub mouseevent: UIEvent,
+    mouseevent: UIEvent,
-    pub screen_x: Cell<i32>,
+    screen_x: Cell<i32>,
-    pub screen_y: Cell<i32>,
+    screen_y: Cell<i32>,
-    pub client_x: Cell<i32>,
+    client_x: Cell<i32>,
-    pub client_y: Cell<i32>,
+    client_y: Cell<i32>,
-    pub ctrl_key: Cell<bool>,
+    ctrl_key: Cell<bool>,
-    pub shift_key: Cell<bool>,
+    shift_key: Cell<bool>,
-    pub alt_key: Cell<bool>,
+    alt_key: Cell<bool>,
-    pub meta_key: Cell<bool>,
+    meta_key: Cell<bool>,
-    pub button: Cell<i16>,
+    button: Cell<i16>,
-    pub related_target: MutNullableJS<EventTarget>
+    related_target: MutNullableJS<EventTarget>
 }
 
 impl MouseEventDerived for Event {

components/script/dom/namednodemap.rs

@@ -13,6 +13,7 @@ use dom::window::Window;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct NamedNodeMap {
     reflector_: Reflector,
     owner: JS<Element>,

components/script/dom/navigator.rs

@@ -13,8 +13,9 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Navigator {
-    pub reflector_: Reflector //XXXjdm cycle: window->navigator->window
+    reflector_: Reflector //XXXjdm cycle: window->navigator->window
 }
 
 impl Navigator {

components/script/dom/nodeiterator.rs

@@ -10,8 +10,9 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct NodeIterator {
-    pub reflector_: Reflector
+    reflector_: Reflector
 }
 
 impl NodeIterator {

components/script/dom/nodelist.rs

@@ -19,6 +19,7 @@ pub enum NodeListType {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct NodeList {
     list_type: NodeListType,
     reflector_: Reflector,

components/script/dom/performance.rs

@@ -15,6 +15,7 @@ pub type DOMHighResTimeStamp = f64;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Performance {
     reflector_: Reflector,
     timing: JS<PerformanceTiming>,

components/script/dom/performancetiming.rs

@@ -11,6 +11,7 @@ use dom::window::Window;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct PerformanceTiming {
     reflector_: Reflector,
     navigationStart: u64,

components/script/dom/progressevent.rs

@@ -15,6 +15,7 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct ProgressEvent {
     event: Event,
     length_computable: bool,

components/script/dom/range.rs

@@ -13,6 +13,7 @@ use dom::document::Document;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Range {
     reflector_: Reflector
 }

components/script/dom/screen.rs

@@ -11,6 +11,7 @@ use dom::window::Window;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Screen {
     reflector_: Reflector,
 }

components/script/dom/testbinding.rs

@@ -20,6 +20,7 @@ use js::jsval::{JSVal, NullValue};
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct TestBinding {
     reflector: Reflector,
     global: GlobalField,

components/script/dom/treewalker.rs

@@ -23,12 +23,13 @@ use std::cell::Cell;
 // http://dom.spec.whatwg.org/#interface-treewalker
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct TreeWalker {
-    pub reflector_: Reflector,
+    reflector_: Reflector,
-    pub root_node: JS<Node>,
+    root_node: JS<Node>,
-    pub current_node: Cell<JS<Node>>,
+    current_node: Cell<JS<Node>>,
-    pub what_to_show: u32,
+    what_to_show: u32,
-    pub filter: Filter
+    filter: Filter
 }
 
 impl TreeWalker {

components/script/dom/urlsearchparams.rs

@@ -22,6 +22,7 @@ use std::ascii::OwnedStrAsciiExt;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct URLSearchParams {
     data: RefCell<HashMap<DOMString, Vec<DOMString>>>,
     reflector_: Reflector,

components/script/dom/validitystate.rs

@@ -10,6 +10,7 @@ use dom::window::Window;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct ValidityState {
     reflector_: Reflector,
     state: u8,

components/script/dom/worker.rs

@@ -33,6 +33,7 @@ untraceable!(TrustedWorkerAddress)
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct Worker {
     eventtarget: EventTarget,
     refcount: Cell<uint>,

components/script/dom/workerlocation.rs

@@ -16,6 +16,7 @@ use url::Url;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct WorkerLocation {
     reflector_: Reflector,
     url: Url,

components/script/dom/workernavigator.rs

@@ -13,6 +13,7 @@ use servo_util::str::DOMString;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct WorkerNavigator {
     reflector_: Reflector,
 }

components/script/dom/xmlhttprequest.rs

@@ -104,6 +104,7 @@ enum SyncOrAsync<'a> {
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct XMLHttpRequest {
     eventtarget: XMLHttpRequestEventTarget,
     ready_state: Cell<XMLHttpRequestState>,

components/script/dom/xmlhttprequestupload.rs

@@ -13,6 +13,7 @@ use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget;
 
 #[jstraceable]
 #[must_root]
+#[privatize]
 pub struct XMLHttpRequestUpload {
     eventtarget: XMLHttpRequestEventTarget
 }