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

Auto merge of #11913 - jdm:stylesheet-error, r=Ms2ger

Browse source 
Avoid stalled pages containing unreachable stylesheets

This hits some of the pages in the performance testsuite, and leads to a poor user experience since the document load event is never dispatched and the page never finishes parsing.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #11535 (github issue number if applicable).
- [X] There are tests for these changes OR

<!-- 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/11913)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-29 11:42:40 -05:00 • committed by GitHub
commit 55ab7a8b12
2 changed files with 59 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -289,10 +289,12 @@ impl AsyncResponseListener for StylesheetContext {
}
fn response_complete(&mut self, status: Result<(), NetworkError>) {
let elem = self.elem.root();
let document = document_from_node(&*elem);
if status.is_err() {
self.elem.root().upcast::<EventTarget>().fire_simple_event("error");
return;
}
} else {
let data = mem::replace(&mut self.data, vec!());
let metadata = match self.metadata.take() {
Some(meta) => meta,
@ -303,7 +305,6 @@ impl AsyncResponseListener for StylesheetContext {
let protocol_encoding_label = metadata.charset.as_ref().map(|s| &**s);
let final_url = metadata.final_url;
let elem = self.elem.root();
let win = window_from_node(&*elem);
let mut sheet = Stylesheet::from_bytes(&data, final_url, protocol_encoding_label,
@ -315,7 +316,6 @@ impl AsyncResponseListener for StylesheetContext {
let sheet = Arc::new(sheet);
let elem = elem.r();
let document = document_from_node(elem);
let document = document.r();
let win = window_from_node(elem);
@ -323,9 +323,12 @@ impl AsyncResponseListener for StylesheetContext {
*elem.stylesheet.borrow_mut() = Some(sheet);
document.invalidate_stylesheets();
}
if elem.parser_inserted.get() {
document.decrement_script_blocking_stylesheet_count();
}
document.finish_load(LoadType::Stylesheet(self.url.clone()));
}
}

37
tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html
View file

@ -7,17 +7,32 @@
<div id="log"></div>
<div id="test">
<script>
//var t404 = async_test("Should get an error event for a 404 error.")
//t404.step(function() {
// var elt = document.createElement("link");
// elt.onerror = t404.step_func(function() {
// assert_true(true, "Got error event for 404 error.")
// t404.done()
// })
// elt.rel = "stylesheet";
// elt.href = 404 error;
// document.getElementsByTagName("head")[0].appendChild(elt);
//})
var t404 = async_test("Should get an error event for a 404 error.")
t404.step(function() {
var elt = document.createElement("link");
elt.onerror = t404.step_func(function() {
assert_true(true, "Got error event for 404 error.")
t404.step_timeout(function() { t404.done() }, 0);
})
elt.onload = t404.unreached_func("load event should not be fired");
elt.rel = "stylesheet";
elt.href = "nonexistent_stylesheet.css";
document.getElementsByTagName("head")[0].appendChild(elt);
})
var tUnsupported = async_test("Should get an error event for an unsupported URL.")
tUnsupported.step(function() {
var elt = document.createElement("link");
elt.onerror = tUnsupported.step_func(function() {
assert_true(true, "Got error event for unsupported URL.")
tUnsupported.step_timeout(function() { tUnsupported.done() }, 0);
})
elt.onload = tUnsupported.unreached_func("load event should not be fired");
elt.rel = "stylesheet";
elt.href = "nonexistent:stylesheet.css";
document.getElementsByTagName("head")[0].appendChild(elt);
})
var tText = async_test("Should get an error event for a text/plain response.")
tText.step(function() {
var elt = document.createElement("link");