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

Auto merge of #10887 - askeing:fix_10374, r=KiChjang

Browse source 
Dispatch error event when link elements get invalid response

fix #10374

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10887)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-28 14:30:04 -07:00
commit 210803b4b2
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,11 +15,14 @@ use dom::bindings::refcounted::Trusted;
use dom::document::Document;
use dom::domtokenlist::DOMTokenList;
use dom::element::{AttributeMutation, Element, ElementCreator};
use dom::eventtarget::EventTarget;
use dom::htmlelement::HTMLElement;
use dom::node::{Node, document_from_node, window_from_node};
use dom::virtualmethods::VirtualMethods;
use encoding::EncodingRef;
use encoding::all::UTF_8;
use hyper::header::ContentType;
use hyper::mime::{Mime, TopLevel, SubLevel};
use ipc_channel::ipc;
use ipc_channel::router::ROUTER;
use layout_interface::{LayoutChan, Msg};
@ -272,6 +275,12 @@ impl PreInvoke for StylesheetContext {}
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 {
} else {
self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
}
}
}
fn data_available(&mut self, payload: Vec<u8>) {
@ -279,7 +288,11 @@ impl AsyncResponseListener for StylesheetContext {
self.data.append(&mut payload);
}
fn response_complete(&mut self, _status: Result<(), NetworkError>) {
fn response_complete(&mut self, status: Result<(), NetworkError>) {
if status.is_err() {
self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
return;
}
let data = mem::replace(&mut self.data, vec!());
let metadata = match self.metadata.take() {
Some(meta) => meta,

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

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