auto merge of #3684 : Manishearth/servo/dom_struct, r=jdm

This attribute implies #[jstraceable], #[privatize], and #[must_root].

components/plugins/jstraceable.rs

@@ -7,10 +7,20 @@ use syntax::codemap::Span;
 use syntax::ptr::P;
 use syntax::ast::{Item, MetaItem, Expr};
 use syntax::ast;
+use syntax::attr;
 use syntax::ext::build::AstBuilder;
 use syntax::ext::deriving::generic::{combine_substructure, EnumMatching, FieldInfo, MethodDef, Struct, Substructure, TraitDef, ty};
+use syntax::parse::token::InternedString;
 
- pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: &Item, push: |P<Item>|) {
+pub fn expand_dom_struct(_: &mut ExtCtxt, _: Span, _: &MetaItem, item: P<Item>) -> P<Item> {
+    let mut item2 = (*item).clone();
+    item2.attrs.push(attr::mk_attr_outer(attr::mk_attr_id(), attr::mk_word_item(InternedString::new("must_root"))));
+    item2.attrs.push(attr::mk_attr_outer(attr::mk_attr_id(), attr::mk_word_item(InternedString::new("privatize"))));
+    item2.attrs.push(attr::mk_attr_outer(attr::mk_attr_id(), attr::mk_word_item(InternedString::new("jstraceable"))));
+    P(item2)
+}
+
+pub fn expand_jstraceable(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: &Item, push: |P<Item>|) {
     let trait_def = TraitDef {
         span: span,
         attributes: Vec::new(),
@@ -24,7 +34,7 @@ use syntax::ext::deriving::generic::{combine_substructure, EnumMatching, FieldIn
                 explicit_self: ty::borrowed_explicit_self(),
                 args: vec!(ty::Ptr(box ty::Literal(ty::Path::new(vec!("js","jsapi","JSTracer"))), ty::Raw(ast::MutMutable))),
                 ret_ty: ty::nil_ty(),
-                attributes: vec!(),
+                attributes: vec!(attr::mk_attr_outer(attr::mk_attr_id(), attr::mk_word_item(InternedString::new("inline")))),
                 combine_substructure: combine_substructure(|a, b, c| {
                     jstraceable_substructure(a, b, c)
                 })

components/plugins/lib.rs

@@ -15,7 +15,7 @@ extern crate sync;
 
 use rustc::lint::LintPassObject;
 use rustc::plugin::Registry;
-use syntax::ext::base::Decorator;
+use syntax::ext::base::{Decorator, Modifier};
 
 use syntax::parse::token::intern;
 
@@ -25,9 +25,10 @@ mod jstraceable;
 
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {
+    reg.register_syntax_extension(intern("dom_struct"), Modifier(box jstraceable::expand_dom_struct));
+    reg.register_syntax_extension(intern("jstraceable"), Decorator(box jstraceable::expand_jstraceable));
     reg.register_lint_pass(box lints::TransmutePass as LintPassObject);
     reg.register_lint_pass(box lints::UnrootedPass as LintPassObject);
     reg.register_lint_pass(box lints::PrivatizePass as LintPassObject);
-    reg.register_syntax_extension(intern("jstraceable"), Decorator(box jstraceable::expand_jstraceable))
 }
 

components/script/dom/attr.rs

@@ -69,9 +69,7 @@ impl Str for AttrValue {
     }
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Attr {
     reflector_: Reflector,
     local_name: Atom,

components/script/dom/blob.rs

@@ -15,9 +15,7 @@ pub enum BlobType {
     FileTypeId
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Blob {
     reflector_: Reflector,
     type_: BlobType

components/script/dom/browsercontext.rs

@@ -65,9 +65,7 @@ impl BrowserContext {
     }
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct SessionHistoryEntry {
     document: JS<Document>,
     children: Vec<BrowserContext>

components/script/dom/canvasrenderingcontext2d.rs

@@ -15,9 +15,7 @@ use geom::size::Size2D;
 
 use canvas::canvas_render_task::{CanvasMsg, CanvasRenderTask, ClearRect, Close, FillRect, Recreate, StrokeRect};
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct CanvasRenderingContext2D {
     reflector_: Reflector,
     global: GlobalField,

components/script/dom/characterdata.rs

@@ -15,9 +15,7 @@ use dom::eventtarget::{EventTarget, NodeTargetTypeId};
 use dom::node::{CommentNodeTypeId, Node, NodeTypeId, TextNodeTypeId, ProcessingInstructionNodeTypeId, NodeHelpers};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct CharacterData {
     node: Node,
     data: DOMRefCell<DOMString>,

components/script/dom/comment.rs

@@ -16,9 +16,7 @@ use dom::node::{CommentNodeTypeId, Node};
 use servo_util::str::DOMString;
 
 /// An HTML comment.
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Comment {
     characterdata: CharacterData,
 }

components/script/dom/console.rs

@@ -9,9 +9,7 @@ use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Console {
     reflector_: Reflector
 }

components/script/dom/customevent.rs

@@ -17,9 +17,7 @@ use servo_util::str::DOMString;
 
 use std::cell::Cell;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct CustomEvent {
     event: Event,
     detail: Cell<JSVal>,

components/script/dom/dedicatedworkerglobalscope.rs

@@ -36,9 +36,7 @@ use std::task::TaskBuilder;
 use native::task::NativeTaskBuilder;
 use url::Url;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DedicatedWorkerGlobalScope {
     workerglobalscope: WorkerGlobalScope,
     receiver: Receiver<ScriptMsg>,

components/script/dom/document.rs

@@ -73,9 +73,7 @@ pub enum IsHTMLDocument {
     NonHTMLDocument,
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Document {
     node: Node,
     window: JS<Window>,

components/script/dom/documentfragment.rs

@@ -18,9 +18,7 @@ use dom::node::{DocumentFragmentNodeTypeId, Node, NodeHelpers, window_from_node}
 use dom::nodelist::NodeList;
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DocumentFragment {
     node: Node,
 }

components/script/dom/documenttype.rs

@@ -13,9 +13,7 @@ use dom::node::{Node, DoctypeNodeTypeId, NodeHelpers};
 use servo_util::str::DOMString;
 
 /// The `DOCTYPE` tag.
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DocumentType {
     node: Node,
     name: DOMString,

components/script/dom/domexception.rs

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

components/script/dom/domimplementation.rs

@@ -22,9 +22,7 @@ use dom::node::Node;
 use dom::text::Text;
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DOMImplementation {
     document: JS<Document>,
     reflector_: Reflector,

components/script/dom/domparser.rs

@@ -14,9 +14,7 @@ use dom::document::{Document, HTMLDocument, NonHTMLDocument};
 use dom::window::Window;
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DOMParser {
     window: JS<Window>, //XXXjdm Document instead?
     reflector_: Reflector

components/script/dom/domrect.rs

@@ -10,9 +10,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::window::Window;
 use servo_util::geometry::Au;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DOMRect {
     reflector_: Reflector,
     top: f32,

components/script/dom/domrectlist.rs

@@ -10,9 +10,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::domrect::DOMRect;
 use dom::window::Window;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DOMRectList {
     reflector_: Reflector,
     rects: Vec<JS<DOMRect>>,

components/script/dom/domtokenlist.rs

@@ -15,9 +15,7 @@ use dom::node::window_from_node;
 use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct DOMTokenList {
     reflector_: Reflector,
     element: JS<Element>,

components/script/dom/element.rs

@@ -45,9 +45,7 @@ use std::mem;
 use string_cache::{Atom, Namespace};
 use url::UrlParser;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Element {
     node: Node,
     local_name: Atom,

components/script/dom/event.rs

@@ -47,9 +47,7 @@ pub enum EventCancelable {
     NotCancelable
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Event {
     type_id: EventTypeId,
     reflector_: Reflector,

components/script/dom/eventtarget.rs

@@ -65,9 +65,7 @@ pub struct EventListenerEntry {
     listener: EventListenerType
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct EventTarget {
     type_id: EventTargetTypeId,
     reflector_: Reflector,

components/script/dom/file.rs

@@ -10,9 +10,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::blob::{Blob, BlobType, FileTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct File {
     blob: Blob,
     name: DOMString,

components/script/dom/formdata.rs

@@ -25,9 +25,7 @@ pub enum FormDatum {
     FileData(JS<File>)
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct FormData {
     data: RefCell<HashMap<DOMString, Vec<FormDatum>>>,
     reflector_: Reflector,

components/script/dom/htmlanchorelement.rs

@@ -21,9 +21,7 @@ use dom::virtualmethods::VirtualMethods;
 
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLAnchorElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlappletelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLAppletElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlaudioelement.rs

@@ -13,9 +13,7 @@ use dom::htmlmediaelement::HTMLMediaElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLAudioElement {
     htmlmediaelement: HTMLMediaElement
 }

components/script/dom/htmlbaseelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLBaseElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlbodyelement.rs

@@ -20,9 +20,7 @@ use dom::virtualmethods::VirtualMethods;
 use servo_util::str::DOMString;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLBodyElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlbrelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLBRElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlbuttonelement.rs

@@ -20,9 +20,7 @@ use std::ascii::OwnedStrAsciiExt;
 use servo_util::str::DOMString;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLButtonElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlcanvaselement.rs

@@ -28,9 +28,7 @@ use std::default::Default;
 static DefaultWidth: u32 = 300;
 static DefaultHeight: u32 = 150;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLCanvasElement {
     htmlelement: HTMLElement,
     context: MutNullableJS<CanvasRenderingContext2D>,

components/script/dom/htmlcollection.rs

@@ -29,9 +29,7 @@ pub enum CollectionTypeId {
     Live(JS<Node>, Box<CollectionFilter+'static>)
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLCollection {
     collection: CollectionTypeId,
     reflector_: Reflector,

components/script/dom/htmldataelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLDataElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmldatalistelement.rs

@@ -16,9 +16,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLDataListElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmldirectoryelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLDirectoryElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmldivelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLDivElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmldlistelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLDListElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlelement.rs

@@ -20,9 +20,7 @@ use dom::virtualmethods::VirtualMethods;
 use servo_util::str::DOMString;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLElement {
     element: Element
 }

components/script/dom/htmlembedelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLEmbedElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlfieldsetelement.rs

@@ -21,9 +21,7 @@ use dom::virtualmethods::VirtualMethods;
 use servo_util::str::{DOMString, StaticStringVec};
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLFieldSetElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlfontelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLFontElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlformelement.rs

@@ -30,9 +30,7 @@ use url::UrlParser;
 use url::form_urlencoded::serialize;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLFormElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlframeelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLFrameElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlframesetelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLFrameSetElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlheadelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLHeadElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlheadingelement.rs

@@ -23,9 +23,7 @@ pub enum HeadingLevel {
     Heading6,
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLHeadingElement {
     htmlelement: HTMLElement,
     level: HeadingLevel,

components/script/dom/htmlhrelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLHRElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlhtmlelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLHtmlElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmliframeelement.rs

@@ -39,9 +39,7 @@ enum SandboxAllowance {
     AllowPopups = 0x20
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLIFrameElement {
     htmlelement: HTMLElement,
     size: Cell<Option<IFrameSize>>,

components/script/dom/htmlimageelement.rs

@@ -24,9 +24,7 @@ use url::{Url, UrlParser};
 
 use std::cell::RefCell;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLImageElement {
     htmlelement: HTMLElement,
     image: RefCell<Option<Url>>,

components/script/dom/htmlinputelement.rs

@@ -44,9 +44,7 @@ enum InputType {
     InputPassword
 }
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLInputElement {
     htmlelement: HTMLElement,
     input_type: Cell<InputType>,

components/script/dom/htmllabelelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLLabelElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmllegendelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLLegendElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmllielement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLLIElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmllinkelement.rs

@@ -21,9 +21,7 @@ use std::ascii::StrAsciiExt;
 use url::UrlParser;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLLinkElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlmapelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLMapElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlmediaelement.rs

@@ -12,9 +12,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::ElementNodeTypeId;
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLMediaElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlmetaelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLMetaElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlmeterelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLMeterElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlmodelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLModElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlobjectelement.rs

@@ -25,9 +25,7 @@ use string_cache::Atom;
 
 use url::Url;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLObjectElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlolistelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLOListElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmloptgroupelement.rs

@@ -18,9 +18,7 @@ use dom::virtualmethods::VirtualMethods;
 use servo_util::str::DOMString;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLOptGroupElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmloptionelement.rs

@@ -22,9 +22,7 @@ use dom::virtualmethods::VirtualMethods;
 use servo_util::str::{DOMString, split_html_space_chars};
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLOptionElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmloutputelement.rs

@@ -15,9 +15,7 @@ use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use dom::validitystate::ValidityState;
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLOutputElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlparagraphelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLParagraphElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlparamelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLParamElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlpreelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLPreElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlprogresselement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLProgressElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlquoteelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLQuoteElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlscriptelement.rs

@@ -18,9 +18,7 @@ use dom::node::{Node, NodeHelpers, ElementNodeTypeId};
 
 use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec};
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLScriptElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlselectelement.rs

@@ -21,9 +21,7 @@ use dom::virtualmethods::VirtualMethods;
 use servo_util::str::DOMString;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLSelectElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlsourceelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLSourceElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlspanelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLSpanElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlstyleelement.rs

@@ -17,9 +17,7 @@ use layout_interface::{AddStylesheetMsg, LayoutChan};
 use servo_util::str::DOMString;
 use style::Stylesheet;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLStyleElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltablecaptionelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableCaptionElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmltablecellelement.rs

@@ -18,9 +18,7 @@ use servo_util::str;
 use std::cell::Cell;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableCellElement {
     htmlelement: HTMLElement,
     width: Cell<LengthOrPercentageOrAuto>,

components/script/dom/htmltablecolelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableColElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltabledatacellelement.rs

@@ -13,9 +13,7 @@ use dom::htmltablecellelement::HTMLTableCellElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableDataCellElement {
     htmltablecellelement: HTMLTableCellElement,
 }

components/script/dom/htmltableelement.rs

@@ -17,9 +17,7 @@ use dom::htmltablecaptionelement::HTMLTableCaptionElement;
 use dom::node::{Node, NodeHelpers, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltableheadercellelement.rs

@@ -13,9 +13,7 @@ use dom::htmltablecellelement::HTMLTableCellElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableHeaderCellElement {
     htmltablecellelement: HTMLTableCellElement,
 }

components/script/dom/htmltablerowelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableRowElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltablesectionelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTableSectionElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltemplateelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTemplateElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltextareaelement.rs

@@ -18,9 +18,7 @@ use dom::virtualmethods::VirtualMethods;
 use servo_util::str::DOMString;
 use string_cache::Atom;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTextAreaElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltimeelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTimeElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmltitleelement.rs

@@ -16,9 +16,7 @@ use dom::node::{Node, NodeHelpers, ElementNodeTypeId};
 use dom::text::Text;
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTitleElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmltrackelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLTrackElement {
     htmlelement: HTMLElement,
 }

components/script/dom/htmlulistelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLUListElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlunknownelement.rs

@@ -13,9 +13,7 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLUnknownElement {
     htmlelement: HTMLElement
 }

components/script/dom/htmlvideoelement.rs

@@ -13,9 +13,7 @@ use dom::htmlmediaelement::HTMLMediaElement;
 use dom::node::{Node, ElementNodeTypeId};
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct HTMLVideoElement {
     htmlmediaelement: HTMLMediaElement
 }

components/script/dom/location.rs

@@ -15,9 +15,7 @@ use servo_util::str::DOMString;
 
 use std::rc::Rc;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Location {
     reflector_: Reflector,
     page: Rc<Page>,

components/script/dom/messageevent.rs

@@ -18,9 +18,7 @@ use servo_util::str::DOMString;
 use js::jsapi::JSContext;
 use js::jsval::JSVal;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct MessageEvent {
     event: Event,
     data: JSVal,

components/script/dom/mouseevent.rs

@@ -19,9 +19,7 @@ use servo_util::str::DOMString;
 use std::cell::Cell;
 use std::default::Default;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct MouseEvent {
     mouseevent: UIEvent,
     screen_x: Cell<i32>,

components/script/dom/namednodemap.rs

@@ -11,9 +11,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::element::Element;
 use dom::window::Window;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct NamedNodeMap {
     reflector_: Reflector,
     owner: JS<Element>,

components/script/dom/navigator.rs

@@ -11,9 +11,7 @@ use dom::navigatorinfo::NavigatorInfo;
 use dom::window::Window;
 use servo_util::str::DOMString;
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Navigator {
     reflector_: Reflector,
 }

components/script/dom/node.rs

@@ -71,9 +71,7 @@ use uuid;
 //
 
 /// An HTML node.
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct Node {
     /// The JavaScript reflector for this node.
     eventtarget: EventTarget,

components/script/dom/nodeiterator.rs

@@ -8,9 +8,7 @@ use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 
-#[jstraceable]
+#[dom_struct]
-#[must_root]
-#[privatize]
 pub struct NodeIterator {
     reflector_: Reflector
 }