diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/htmllinkelement.rs | 7 | ||||
| -rw-r--r-- | components/script/dom/htmlmediaelement.rs | 3 | ||||
| -rw-r--r-- | components/script/dom/htmlscriptelement.rs | 3 | ||||
| -rw-r--r-- | components/script/dom/servohtmlparser.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 6 |
5 files changed, 16 insertions, 7 deletions
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 0d5ae4ee179..9264bcb0490 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -24,6 +24,7 @@ use encoding::all::UTF_8; use hyper::header::ContentType; use hyper::http::RawStatus; use hyper::mime::{Mime, TopLevel, SubLevel}; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use net_traits::{AsyncResponseListener, AsyncResponseTarget, Metadata, NetworkError}; @@ -282,7 +283,7 @@ impl AsyncResponseListener for StylesheetContext { fn headers_available(&mut self, metadata: Result<Metadata, NetworkError>) { self.metadata = metadata.ok(); if let Some(ref meta) = self.metadata { - if let Some(ContentType(Mime(TopLevel::Text, SubLevel::Css, _))) = meta.content_type { + if let Some(Serde(ContentType(Mime(TopLevel::Text, SubLevel::Css, _)))) = meta.content_type { } else { self.elem.root().upcast::<EventTarget>().fire_simple_event("error"); } @@ -304,7 +305,7 @@ impl AsyncResponseListener for StylesheetContext { Some(meta) => meta, None => return, }; - let is_css = metadata.content_type.map_or(false, |ContentType(Mime(top, sub, _))| + let is_css = metadata.content_type.map_or(false, |Serde(ContentType(Mime(top, sub, _)))| top == TopLevel::Text && sub == SubLevel::Css); let data = if is_css { mem::replace(&mut self.data, vec!()) } else { vec!() }; @@ -334,7 +335,7 @@ impl AsyncResponseListener for StylesheetContext { document.invalidate_stylesheets(); // FIXME: Revisit once consensus is reached at: https://github.com/whatwg/html/issues/1142 - successful = metadata.status.map_or(false, |RawStatus(code, _)| code == 200); + successful = metadata.status.map_or(false, |Serde(RawStatus(code, _))| code == 200); } if elem.parser_inserted.get() { diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 119139ae6d8..1c7a27fcef6 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -24,6 +24,7 @@ use dom::htmlsourceelement::HTMLSourceElement; use dom::mediaerror::MediaError; use dom::node::{window_from_node, document_from_node, Node, UnbindContext}; use dom::virtualmethods::VirtualMethods; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use net_traits::{AsyncResponseListener, AsyncResponseTarget, Metadata, NetworkError}; @@ -67,7 +68,7 @@ impl AsyncResponseListener for HTMLMediaElementContext { .as_ref() .and_then(|m| m.status .as_ref() - .map(|s| s.0 < 200 || s.0 >= 300)) + .map(|&Serde(ref s)| s.0 < 200 || s.0 >= 300)) .unwrap_or(false); if is_failure { // Ensure that the element doesn't receive any further notifications diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 442f3063524..6a6fe7d50b4 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -27,6 +27,7 @@ use encoding::label::encoding_from_whatwg_label; use encoding::types::{DecoderTrap, EncodingRef}; use html5ever::tree_builder::NextParserState; use hyper::http::RawStatus; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsval::UndefinedValue; @@ -158,7 +159,7 @@ impl AsyncResponseListener for ScriptContext { let status_code = self.metadata.as_ref().and_then(|m| { match m.status { - Some(RawStatus(c, _)) => Some(c), + Some(Serde(RawStatus(c, _))) => Some(c), _ => None, } }).unwrap_or(0); diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs index 09ee38a1232..d4d2cbc911a 100644 --- a/components/script/dom/servohtmlparser.rs +++ b/components/script/dom/servohtmlparser.rs @@ -28,6 +28,7 @@ use html5ever::tree_builder; use html5ever::tree_builder::{TreeBuilder, TreeBuilderOpts}; use hyper::header::ContentType; use hyper::mime::{Mime, SubLevel, TopLevel}; +use hyper_serde::Serde; use js::jsapi::JSTracer; use msg::constellation_msg::{PipelineId, SubpageId}; use net_traits::{AsyncResponseListener, Metadata, NetworkError}; @@ -98,7 +99,8 @@ impl AsyncResponseListener for ParserContext { }, Err(_) => None, }; - let content_type = metadata.clone().and_then(|meta| meta.content_type); + let content_type = + metadata.clone().and_then(|meta| meta.content_type).map(Serde::into_inner); let parser = match ScriptThread::page_headers_available(&self.id, self.subpage.as_ref(), metadata) { diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 1d58e118cf4..382e4c69faa 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -39,6 +39,7 @@ use hyper::header::{ContentLength, ContentType}; use hyper::http::RawStatus; use hyper::method::Method; use hyper::mime::{self, Mime, Attr as MimeAttr, Value as MimeValue}; +use hyper_serde::Serde; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsapi::JS_ClearPendingException; @@ -875,7 +876,10 @@ impl XMLHttpRequest { *self.response_url.borrow_mut() = metadata.final_url[..Position::AfterQuery].to_owned(); // XXXManishearth Clear cache entries in case of a network error - self.process_partial_response(XHRProgress::HeadersReceived(gen_id, metadata.headers, metadata.status)); + self.process_partial_response(XHRProgress::HeadersReceived( + gen_id, + metadata.headers.map(Serde::into_inner), + metadata.status.map(Serde::into_inner))); Ok(()) } |