diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-17 18:45:49 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-17 18:45:49 -0700 |
| commit | fbf42c951b2f53d91e2f32f8035484a07ea83493 (patch) | |
| tree | 1d7bfb30cbddebba633fe1f2c8844cf4133aabc1 /components/script/parse/html.rs | |
| parent | b8900782b0fcb409f37189bdc08eb7f8b3564a5f (diff) | |
| parent | 1a9be88a1d1f9138287f5b1ee04300b7e1bd7025 (diff) | |
| download | servo-fbf42c951b2f53d91e2f32f8035484a07ea83493.tar.gz servo-fbf42c951b2f53d91e2f32f8035484a07ea83493.zip | |
auto merge of #4405 : servo/servo/rustup_20141124, r=jdm
Diffstat (limited to 'components/script/parse/html.rs')
| -rw-r--r-- | components/script/parse/html.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index e4980fd6a1c..99d23e33674 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -9,7 +9,7 @@ use dom::bindings::js::{JS, JSRef, Temporary, OptionalRootable, Root}; use dom::comment::Comment; use dom::document::{Document, DocumentHelpers}; use dom::documenttype::DocumentType; -use dom::element::{Element, AttributeHandlers, ElementHelpers, ParserCreated}; +use dom::element::{Element, AttributeHandlers, ElementHelpers, ElementCreator}; use dom::htmlscriptelement::HTMLScriptElement; use dom::htmlscriptelement::HTMLScriptElementHelpers; use dom::node::{Node, NodeHelpers, TrustedNodeAddress}; @@ -19,7 +19,7 @@ use dom::text::Text; use parse::Parser; use encoding::all::UTF_8; -use encoding::types::{Encoding, DecodeReplace}; +use encoding::types::{Encoding, DecoderTrap}; use servo_net::resource_task::{Payload, Done, LoadResponse}; use servo_util::task_state; @@ -77,7 +77,8 @@ impl<'a> TreeSink<TrustedNodeAddress> for servohtmlparser::Sink { fn create_element(&mut self, name: QualName, attrs: Vec<Attribute>) -> TrustedNodeAddress { let doc = self.document.root(); - let elem = Element::create(name, None, *doc, ParserCreated).root(); + let elem = Element::create(name, None, *doc, + ElementCreator::ParserCreated).root(); for attr in attrs.into_iter() { elem.set_attribute_from_parser(attr.name, attr.value, None); @@ -170,10 +171,10 @@ pub fn parse_html(document: JSRef<Document>, task_state::enter(IN_HTML_PARSER); match input { - InputString(s) => { + HTMLInput::InputString(s) => { parser.parse_chunk(s); } - InputUrl(load_response) => { + HTMLInput::InputUrl(load_response) => { match load_response.metadata.content_type { Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => { let page = format!("<html><body><img src='{:s}' /></body></html>", url.serialize()); @@ -184,7 +185,7 @@ pub fn parse_html(document: JSRef<Document>, match msg { Payload(data) => { // FIXME: use Vec<u8> (html5ever #34) - let data = UTF_8.decode(data.as_slice(), DecodeReplace).unwrap(); + let data = UTF_8.decode(data.as_slice(), DecoderTrap::Replace).unwrap(); parser.parse_chunk(data); } Done(Err(err)) => { |