Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto-derive JSTraceable and Reflectable for ServoHTMLParser

Browse source
This commit is contained in:
Michael Wu 2015-06-30 15:53:04 -04:00
parent 1e0c89390c
commit de788e0529
1 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/script/dom/servohtmlparser.rs
View file

@ -12,7 +12,7 @@ use dom::bindings::global::GlobalRef;
use dom::bindings::trace::JSTraceable; use dom::bindings::trace::JSTraceable;
use dom::bindings::js::{JS, Root}; use dom::bindings::js::{JS, Root};
use dom::bindings::refcounted::Trusted; use dom::bindings::refcounted::Trusted;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::document::{Document, DocumentHelpers}; use dom::document::{Document, DocumentHelpers};
use dom::node::{window_from_node, Node}; use dom::node::{window_from_node, Node};
use dom::window::Window; use dom::window::Window;
@ -28,7 +28,7 @@ use encoding::types::{Encoding, DecoderTrap};
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
use std::default::Default; use std::default::Default;
use url::Url; use url::Url;
use js::jsapi::{JSTracer, JSObject}; use js::jsapi::JSTracer;
use html5ever::tokenizer; use html5ever::tokenizer;
use html5ever::tree_builder; use html5ever::tree_builder;
use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts}; use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts};
@ -156,10 +156,7 @@ impl AsyncResponseListener for ParserContext {
impl PreInvoke for ParserContext { impl PreInvoke for ParserContext {
} }
// NB: JSTraceable is *not* auto-derived. #[dom_struct]
// You must edit the impl below if you add fields!
#[must_root]
#[privatize]
pub struct ServoHTMLParser { pub struct ServoHTMLParser {
reflector_: Reflector, reflector_: Reflector,
tokenizer: DOMRefCell<Tokenizer>, tokenizer: DOMRefCell<Tokenizer>,
@ -274,15 +271,6 @@ impl ServoHTMLParser {
} }
} }
impl Reflectable for ServoHTMLParser {
fn reflector<'a>(&'a self) -> &'a Reflector {
&self.reflector_
}
fn init_reflector(&mut self, obj: *mut JSObject) {
self.reflector_.set_jsobject(obj);
}
}
trait PrivateServoHTMLParserHelpers { trait PrivateServoHTMLParserHelpers {
/// Synchronously run the tokenizer parse loop until explicitly suspended or /// Synchronously run the tokenizer parse loop until explicitly suspended or
/// the tokenizer runs out of input. /// the tokenizer runs out of input.
@ -365,21 +353,15 @@ impl tree_builder::Tracer for Tracer {
} }
} }
impl JSTraceable for ServoHTMLParser { impl JSTraceable for Tokenizer {
#[allow(unsafe_code)]
fn trace(&self, trc: *mut JSTracer) { fn trace(&self, trc: *mut JSTracer) {
self.reflector_.trace(trc);
let tracer = Tracer { let tracer = Tracer {
trc: trc, trc: trc,
}; };
let tracer = &tracer as &tree_builder::Tracer<Handle=JS<Node>>; let tracer = &tracer as &tree_builder::Tracer<Handle=JS<Node>>;
unsafe { let tree_builder = self.sink();
let tokenizer = self.tokenizer.borrow_for_gc_trace(); tree_builder.trace_handles(tracer);
let tree_builder = tokenizer.sink(); tree_builder.sink().trace(trc);
tree_builder.trace_handles(tracer);
tree_builder.sink().trace(trc);
}
} }
} }