From acd98a73a4ea1aad96705c49ab960d9c87a38a28 Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Sun, 12 Oct 2014 19:06:56 +0200 Subject: [PATCH] Simple privatizations --- components/script/dom/blob.rs | 1 + components/script/dom/browsercontext.rs | 2 ++ .../script/dom/canvasrenderingcontext2d.rs | 1 + components/script/dom/console.rs | 3 ++- components/script/dom/customevent.rs | 1 + .../script/dom/dedicatedworkerglobalscope.rs | 1 + components/script/dom/documentfragment.rs | 3 ++- components/script/dom/domexception.rs | 5 ++-- components/script/dom/domimplementation.rs | 1 + components/script/dom/domparser.rs | 1 + components/script/dom/domrect.rs | 1 + components/script/dom/domrectlist.rs | 1 + components/script/dom/domtokenlist.rs | 1 + components/script/dom/formdata.rs | 1 + components/script/dom/htmlcollection.rs | 1 + components/script/dom/location.rs | 1 + components/script/dom/messageevent.rs | 1 + components/script/dom/mouseevent.rs | 23 ++++++++++--------- components/script/dom/namednodemap.rs | 1 + components/script/dom/navigator.rs | 3 ++- components/script/dom/nodeiterator.rs | 3 ++- components/script/dom/nodelist.rs | 1 + components/script/dom/performance.rs | 1 + components/script/dom/performancetiming.rs | 1 + components/script/dom/progressevent.rs | 1 + components/script/dom/range.rs | 1 + components/script/dom/screen.rs | 1 + components/script/dom/testbinding.rs | 1 + components/script/dom/treewalker.rs | 11 +++++---- components/script/dom/urlsearchparams.rs | 1 + components/script/dom/validitystate.rs | 1 + components/script/dom/worker.rs | 1 + components/script/dom/workerlocation.rs | 1 + components/script/dom/workernavigator.rs | 1 + components/script/dom/xmlhttprequest.rs | 1 + components/script/dom/xmlhttprequestupload.rs | 1 + 36 files changed, 59 insertions(+), 22 deletions(-) diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index 71f83dffd96..5849b75ff10 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -17,6 +17,7 @@ pub enum BlobType { #[jstraceable] #[must_root] +#[privatize] pub struct Blob { reflector_: Reflector, type_: BlobType diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index 094dc1a5e09..78b940aa240 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -15,6 +15,7 @@ use std::ptr; #[allow(raw_pointer_deriving)] #[jstraceable] +#[privatize] pub struct BrowserContext { history: Vec, active_index: uint, @@ -66,6 +67,7 @@ impl BrowserContext { #[jstraceable] #[must_root] +#[privatize] pub struct SessionHistoryEntry { document: JS, children: Vec diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index eb80fa498da..c9a19c3301c 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/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, diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index cefb8cfaa87..a62d2ad4047 100644 --- a/components/script/dom/console.rs +++ b/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 { diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index c25c328afaa..1366e6568a8 100644 --- a/components/script/dom/customevent.rs +++ b/components/script/dom/customevent.rs @@ -19,6 +19,7 @@ use std::cell::Cell; #[jstraceable] #[must_root] +#[privatize] pub struct CustomEvent { event: Event, detail: Cell, diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index cd873c39930..2d98b4819a5 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -37,6 +37,7 @@ use url::Url; #[jstraceable] #[must_root] +#[privatize] pub struct DedicatedWorkerGlobalScope { workerglobalscope: WorkerGlobalScope, receiver: Receiver, diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 40a837125a6..ebbb3d0fe0d 100644 --- a/components/script/dom/documentfragment.rs +++ b/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 { diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs index 924494c0455..73dc4c149fe 100644 --- a/components/script/dom/domexception.rs +++ b/components/script/dom/domexception.rs @@ -62,9 +62,10 @@ impl DOMErrorName { #[jstraceable] #[must_root] +#[privatize] pub struct DOMException { - pub code: DOMErrorName, - pub reflector_: Reflector + code: DOMErrorName, + reflector_: Reflector } impl DOMException { diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 063153f369e..39c39454e60 100644 --- a/components/script/dom/domimplementation.rs +++ b/components/script/dom/domimplementation.rs @@ -24,6 +24,7 @@ use servo_util::str::DOMString; #[jstraceable] #[must_root] +#[privatize] pub struct DOMImplementation { document: JS, reflector_: Reflector, diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index 315a3851bb1..7b6bbae3e7c 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -16,6 +16,7 @@ use servo_util::str::DOMString; #[jstraceable] #[must_root] +#[privatize] pub struct DOMParser { window: JS, //XXXjdm Document instead? reflector_: Reflector diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs index 3c79479edab..39e9c4cbb0e 100644 --- a/components/script/dom/domrect.rs +++ b/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, diff --git a/components/script/dom/domrectlist.rs b/components/script/dom/domrectlist.rs index 8be9ab9cbf6..88ec6d5e148 100644 --- a/components/script/dom/domrectlist.rs +++ b/components/script/dom/domrectlist.rs @@ -12,6 +12,7 @@ use dom::window::Window; #[jstraceable] #[must_root] +#[privatize] pub struct DOMRectList { reflector_: Reflector, rects: Vec>, diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 71fb76bdb44..59d931dea31 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -17,6 +17,7 @@ use string_cache::Atom; #[jstraceable] #[must_root] +#[privatize] pub struct DOMTokenList { reflector_: Reflector, element: JS, diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index b0730355bcd..1e2e1ca7049 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -27,6 +27,7 @@ pub enum FormDatum { #[jstraceable] #[must_root] +#[privatize] pub struct FormData { data: RefCell>>, reflector_: Reflector, diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 00c19ad8f92..9e20f4a6572 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -31,6 +31,7 @@ pub enum CollectionTypeId { #[jstraceable] #[must_root] +#[privatize] pub struct HTMLCollection { collection: CollectionTypeId, reflector_: Reflector, diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs index baa57fba1c6..c55da71ad68 100644 --- a/components/script/dom/location.rs +++ b/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, diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index 97b37dedddf..da9d5fe13c6 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -20,6 +20,7 @@ use js::jsval::JSVal; #[jstraceable] #[must_root] +#[privatize] pub struct MessageEvent { event: Event, data: JSVal, diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 9560af42f53..1eb18d4281f 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -21,18 +21,19 @@ use std::default::Default; #[jstraceable] #[must_root] +#[privatize] pub struct MouseEvent { - pub mouseevent: UIEvent, - pub screen_x: Cell, - pub screen_y: Cell, - pub client_x: Cell, - pub client_y: Cell, - pub ctrl_key: Cell, - pub shift_key: Cell, - pub alt_key: Cell, - pub meta_key: Cell, - pub button: Cell, - pub related_target: MutNullableJS + mouseevent: UIEvent, + screen_x: Cell, + screen_y: Cell, + client_x: Cell, + client_y: Cell, + ctrl_key: Cell, + shift_key: Cell, + alt_key: Cell, + meta_key: Cell, + button: Cell, + related_target: MutNullableJS } impl MouseEventDerived for Event { diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs index 3762ec2ad6b..c190a39a37f 100644 --- a/components/script/dom/namednodemap.rs +++ b/components/script/dom/namednodemap.rs @@ -13,6 +13,7 @@ use dom::window::Window; #[jstraceable] #[must_root] +#[privatize] pub struct NamedNodeMap { reflector_: Reflector, owner: JS, diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index 9810c67a877..847259b052b 100644 --- a/components/script/dom/navigator.rs +++ b/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 { diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs index 2e4fe3f442b..27656da9433 100644 --- a/components/script/dom/nodeiterator.rs +++ b/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 { diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index 598ebfa932b..f2da3a0c4ba 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -19,6 +19,7 @@ pub enum NodeListType { #[jstraceable] #[must_root] +#[privatize] pub struct NodeList { list_type: NodeListType, reflector_: Reflector, diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs index f1c5896b2a7..ae6fb7061cc 100644 --- a/components/script/dom/performance.rs +++ b/components/script/dom/performance.rs @@ -15,6 +15,7 @@ pub type DOMHighResTimeStamp = f64; #[jstraceable] #[must_root] +#[privatize] pub struct Performance { reflector_: Reflector, timing: JS, diff --git a/components/script/dom/performancetiming.rs b/components/script/dom/performancetiming.rs index 955187f3dfb..30c2a57462f 100644 --- a/components/script/dom/performancetiming.rs +++ b/components/script/dom/performancetiming.rs @@ -11,6 +11,7 @@ use dom::window::Window; #[jstraceable] #[must_root] +#[privatize] pub struct PerformanceTiming { reflector_: Reflector, navigationStart: u64, diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index 2869a035b25..a8af71ab655 100644 --- a/components/script/dom/progressevent.rs +++ b/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, diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index 56197342d0b..0fe0c7f1751 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -13,6 +13,7 @@ use dom::document::Document; #[jstraceable] #[must_root] +#[privatize] pub struct Range { reflector_: Reflector } diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs index 7fafbd4bc6a..ad4250ee1c6 100644 --- a/components/script/dom/screen.rs +++ b/components/script/dom/screen.rs @@ -11,6 +11,7 @@ use dom::window::Window; #[jstraceable] #[must_root] +#[privatize] pub struct Screen { reflector_: Reflector, } diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 4937dfbd9a8..a409c70d1bf 100644 --- a/components/script/dom/testbinding.rs +++ b/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, diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index 7bdb4403b1a..bc12f165595 100644 --- a/components/script/dom/treewalker.rs +++ b/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, - pub root_node: JS, - pub current_node: Cell>, - pub what_to_show: u32, - pub filter: Filter + reflector_: Reflector, + root_node: JS, + current_node: Cell>, + what_to_show: u32, + filter: Filter } impl TreeWalker { diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index be95361fdbb..8174fafcc98 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -22,6 +22,7 @@ use std::ascii::OwnedStrAsciiExt; #[jstraceable] #[must_root] +#[privatize] pub struct URLSearchParams { data: RefCell>>, reflector_: Reflector, diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs index 99bd9258416..ef76ac433e1 100644 --- a/components/script/dom/validitystate.rs +++ b/components/script/dom/validitystate.rs @@ -10,6 +10,7 @@ use dom::window::Window; #[jstraceable] #[must_root] +#[privatize] pub struct ValidityState { reflector_: Reflector, state: u8, diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 4941a1c6a35..f7feec1929f 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -33,6 +33,7 @@ untraceable!(TrustedWorkerAddress) #[jstraceable] #[must_root] +#[privatize] pub struct Worker { eventtarget: EventTarget, refcount: Cell, diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index 1eaa40829da..145ba8c8f93 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -16,6 +16,7 @@ use url::Url; #[jstraceable] #[must_root] +#[privatize] pub struct WorkerLocation { reflector_: Reflector, url: Url, diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs index 2265b23c6bc..85925e43586 100644 --- a/components/script/dom/workernavigator.rs +++ b/components/script/dom/workernavigator.rs @@ -13,6 +13,7 @@ use servo_util::str::DOMString; #[jstraceable] #[must_root] +#[privatize] pub struct WorkerNavigator { reflector_: Reflector, } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index b51a4859253..37afac6e1b6 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -104,6 +104,7 @@ enum SyncOrAsync<'a> { #[jstraceable] #[must_root] +#[privatize] pub struct XMLHttpRequest { eventtarget: XMLHttpRequestEventTarget, ready_state: Cell, diff --git a/components/script/dom/xmlhttprequestupload.rs b/components/script/dom/xmlhttprequestupload.rs index 2059a69126d..cc686696534 100644 --- a/components/script/dom/xmlhttprequestupload.rs +++ b/components/script/dom/xmlhttprequestupload.rs @@ -13,6 +13,7 @@ use dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget; #[jstraceable] #[must_root] +#[privatize] pub struct XMLHttpRequestUpload { eventtarget: XMLHttpRequestEventTarget }