Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4818 : Ms2ger/servo/tna-parser, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-02-03 09:39:53 -07:00
commit 45ebcf1df7
3 changed files with 33 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/bindings/js.rs
View file

@ -187,17 +187,6 @@ impl <T> Clone for LayoutJS<T> {
}
}
impl JS<Node> {
/// Create a new JS-owned value wrapped from an address known to be a `Node` pointer.
pub unsafe fn from_trusted_node_address(inner: TrustedNodeAddress) -> JS<Node> {
let TrustedNodeAddress(addr) = inner;
assert!(!addr.is_null());
JS {
ptr: NonZero::new(addr as *const Node)
}
}
}
impl LayoutJS<Node> {
/// Create a new JS-owned value wrapped from an address known to be a `Node` pointer.
pub unsafe fn from_trusted_node_address(inner: TrustedNodeAddress) -> LayoutJS<Node> {

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

@ -11,8 +11,8 @@ use dom::bindings::global::GlobalRef;
use dom::bindings::trace::JSTraceable;
use dom::bindings::js::{JS, JSRef, Temporary};
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::node::TrustedNodeAddress;
use dom::document::{Document, DocumentHelpers};
use dom::node::Node;
use parse::Parser;
use util::task_state;
@ -31,7 +31,7 @@ pub struct Sink {
pub document: JS<Document>,
}
pub type Tokenizer = tokenizer::Tokenizer<TreeBuilder<TrustedNodeAddress, Sink>>;
pub type Tokenizer = tokenizer::Tokenizer<TreeBuilder<JS<Node>, Sink>>;
// NB: JSTraceable is *not* auto-derived.
// You must edit the impl below if you add fields!
@ -92,8 +92,9 @@ struct Tracer {
trc: *mut JSTracer,
}
impl tree_builder::Tracer<TrustedNodeAddress> for Tracer {
fn trace_handle(&self, node: TrustedNodeAddress) {
impl tree_builder::Tracer<JS<Node>> for Tracer {
#[allow(unrooted_must_root)]
fn trace_handle(&self, node: JS<Node>) {
node.trace(self.trc);
}
}
@ -106,7 +107,7 @@ impl JSTraceable for ServoHTMLParser {
let tracer = Tracer {
trc: trc,
};
let tracer = &tracer as &tree_builder::Tracer<TrustedNodeAddress>;
let tracer = &tracer as &tree_builder::Tracer<JS<Node>>;
unsafe {
// Assertion: If the parser is mutably borrowed, we're in the