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

Dispatch error event when link elements get invalid response

Browse source
This commit is contained in:
askeing 2016-04-27 01:15:48 +09:00
parent a44ebd5024
commit 80fd18676f
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,11 +15,14 @@ use dom::bindings::refcounted::Trusted;
use dom::document::Document; use dom::document::Document;
use dom::domtokenlist::DOMTokenList; use dom::domtokenlist::DOMTokenList;
use dom::element::{AttributeMutation, Element, ElementCreator}; use dom::element::{AttributeMutation, Element, ElementCreator};
use dom::eventtarget::EventTarget;
use dom::htmlelement::HTMLElement; use dom::htmlelement::HTMLElement;
use dom::node::{Node, document_from_node, window_from_node}; use dom::node::{Node, document_from_node, window_from_node};
use dom::virtualmethods::VirtualMethods; use dom::virtualmethods::VirtualMethods;
use encoding::EncodingRef; use encoding::EncodingRef;
use encoding::all::UTF_8; use encoding::all::UTF_8;
use hyper::header::ContentType;
use hyper::mime::{Mime, TopLevel, SubLevel};
use ipc_channel::ipc; use ipc_channel::ipc;
use ipc_channel::router::ROUTER; use ipc_channel::router::ROUTER;
use layout_interface::{LayoutChan, Msg}; use layout_interface::{LayoutChan, Msg};
@ -273,6 +276,13 @@ impl PreInvoke for StylesheetContext {}
impl AsyncResponseListener for StylesheetContext { impl AsyncResponseListener for StylesheetContext {
fn headers_available(&mut self, metadata: Result<Metadata, NetworkError>) { fn headers_available(&mut self, metadata: Result<Metadata, NetworkError>) {
self.metadata = metadata.ok(); self.metadata = metadata.ok();
let content_type = self.metadata.clone().and_then(|meta| meta.content_type);
match content_type {
Some(ContentType(Mime(TopLevel::Text, SubLevel::Css, _))) => {},
_ => {
self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
}
}
} }
fn data_available(&mut self, payload: Vec<u8>) { fn data_available(&mut self, payload: Vec<u8>) {
@ -281,6 +291,13 @@ impl AsyncResponseListener for StylesheetContext {
} }
fn response_complete(&mut self, _status: Result<(), NetworkError>) { fn response_complete(&mut self, _status: Result<(), NetworkError>) {
match _status {
Err(_) => {
self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
return;
},
_ => {}
};
let data = mem::replace(&mut self.data, vec!()); let data = mem::replace(&mut self.data, vec!());
let metadata = match self.metadata.take() { let metadata = match self.metadata.take() {
Some(meta) => meta, Some(meta) => meta,

4
tests/wpt/metadata/html/semantics/document-metadata/the-link-element/link-style-error-01.html.ini
View file

@ -1,6 +1,6 @@
[link-style-error-01.html] [link-style-error-01.html]
type: testharness type: testharness
expected: TIMEOUT expected: OK
[Should get an error event for a text/plain response.] [Should get an error event for a text/plain response.]
expected: TIMEOUT expected: PASS