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

Remove SinkHelpers

Browse source 
Method get_or_create() is now directly on servohtmlparser::Sink.
This commit is contained in:
Anthony Ramine 2015-08-27 02:11:37 +02:00
parent 275907f256
commit c0cff59df8
2 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
use document_loader::LoadType;
use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::ServoHTMLParserBinding;
use dom::bindings::codegen::InheritTypes::NodeCast;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, Root};
use dom::bindings::refcounted::Trusted;
@ -15,6 +16,7 @@ use dom::bindings::trace::JSTraceable;
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::document::Document;
use dom::node::{window_from_node, Node};
use dom::text::Text;
use dom::window::Window;
use network_listener::PreInvoke;
use parse::Parser;
@ -27,7 +29,7 @@ use encoding::all::UTF_8;
use encoding::types::{Encoding, DecoderTrap};
use html5ever::tokenizer;
use html5ever::tree_builder;
use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts};
use html5ever::tree_builder::{NodeOrText, TreeBuilder, TreeBuilderOpts};
use hyper::header::ContentType;
use hyper::mime::{Mime, TopLevel, SubLevel};
use js::jsapi::JSTracer;
@ -42,6 +44,19 @@ pub struct Sink {
pub document: JS<Document>,
}
impl Sink {
pub fn get_or_create(&self, child: NodeOrText<JS<Node>>) -> Root<Node> {
match child {
NodeOrText::AppendNode(n) => n.root(),
NodeOrText::AppendText(t) => {
let doc = self.document.root();
let text = Text::new(t.into(), &doc);
NodeCast::from_root(text)
}
}
}
}
/// FragmentContext is used only to pass this group of related values
/// into functions.
#[derive(Copy, Clone)]

20
components/script/parse/html.rs
View file

@ -24,7 +24,6 @@ use dom::node::{Node, NodeTypeId};
use dom::node::{document_from_node, window_from_node};
use dom::servohtmlparser;
use dom::servohtmlparser::{ServoHTMLParser, FragmentContext};
use dom::text::Text;
use parse::Parser;
use encoding::types::Encoding;
@ -33,7 +32,7 @@ use html5ever::Attribute;
use html5ever::serialize::TraversalScope;
use html5ever::serialize::TraversalScope::{IncludeNode, ChildrenOnly};
use html5ever::serialize::{Serializable, Serializer, AttrRef};
use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText, NextParserState};
use html5ever::tree_builder::{NextParserState, NodeOrText, QuirksMode, TreeSink};
use msg::constellation_msg::PipelineId;
use std::borrow::Cow;
use std::io::{self, Write};
@ -42,23 +41,6 @@ use tendril::StrTendril;
use url::Url;
use util::str::DOMString;
trait SinkHelpers {
fn get_or_create(&self, child: NodeOrText<JS<Node>>) -> Root<Node>;
}
impl SinkHelpers for servohtmlparser::Sink {
fn get_or_create(&self, child: NodeOrText<JS<Node>>) -> Root<Node> {
match child {
AppendNode(n) => n.root(),
AppendText(t) => {
let doc = self.document.root();
let text = Text::new(t.into(), doc.r());
NodeCast::from_root(text)
}
}
}
}
impl<'a> TreeSink for servohtmlparser::Sink {
type Handle = JS<Node>;
fn get_document(&mut self) -> JS<Node> {