diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-14 15:11:20 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-14 15:11:20 -0500 |
| commit | 7f422e2076e7ebc9949e9fb2ffc3f09c653130c0 (patch) | |
| tree | f5901d29981d491204439e4fbf6786d6be6acf10 /components/script/parse/html.rs | |
| parent | fe81ce942a36b08ece8ef6d58de72624a961eeaa (diff) | |
| parent | 3dd48d214baa952bc5809a91d0a4d4b2bf9beda4 (diff) | |
| download | servo-7f422e2076e7ebc9949e9fb2ffc3f09c653130c0.tar.gz servo-7f422e2076e7ebc9949e9fb2ffc3f09c653130c0.zip | |
Auto merge of #5544 - boghison:master, r=jdm
Fixes #5538
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5544)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/parse/html.rs')
| -rw-r--r-- | components/script/parse/html.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index 9995d06593d..5fb99174591 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -38,7 +38,6 @@ use net_traits::{ProgressMsg, LoadResponse}; use util::str::DOMString; use util::task_state; use util::task_state::IN_HTML_PARSER; -use std::ascii::AsciiExt; use std::borrow::Cow; use std::old_io::{Writer, IoResult}; use url::Url; @@ -49,6 +48,9 @@ use html5ever::serialize::TraversalScope::{IncludeNode, ChildrenOnly}; use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText}; use string_cache::QualName; +use hyper::header::ContentType; +use hyper::mime::{Mime, TopLevel, SubLevel}; + pub enum HTMLInput { InputString(String), InputUrl(LoadResponse), @@ -297,12 +299,11 @@ pub fn parse_html(document: JSRef<Document>, } HTMLInput::InputUrl(load_response) => { match load_response.metadata.content_type { - Some((ref t, _)) if t.as_slice().eq_ignore_ascii_case("image") => { + Some(ContentType(Mime(TopLevel::Image, _, _))) => { let page = format!("<html><body><img src='{}' /></body></html>", url.serialize()); parser.parse_chunk(page); }, - Some((ref t, ref st)) if t.as_slice().eq_ignore_ascii_case("text") && - st.as_slice().eq_ignore_ascii_case("plain") => { + Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain, _))) => { // FIXME: When servo/html5ever#109 is fixed remove <plaintext> usage and // replace with fix from that issue. |