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

Auto merge of #15145 - SwagColoredKitteh:issue-15101, r=emilio

Browse source 
Prevent crashing when a link tag has two or more in-flight requests (fix for issue #15101)

<!-- Please describe your changes on the following line: -->
The `HTMLLinkElement::set_stylesheet` function now checks whether there already is a stylesheet, and if there is, calls `Document::invalidate_stylesheets` after modifying `self.stylesheet`.

This PR also includes a minimal WPT that causes the panic.

This is fundamentally a timing issue, so while this fix prevents the crash, it does not fix the underlying issue. Making a &lt;link&gt; element send a second request before the first can finish and then getting the two stylesheet responses out-of-order will apply the wrong stylesheet, as demonstrated with https://gist.github.com/SwagColoredKitteh/2c24c7fac635445042eda4a30e10420e.

r? @emilio

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15101 (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15145)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-24 07:06:51 -08:00 • committed by GitHub
commit c3f0c9054f
9 changed files with 106 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -8762,6 +8762,18 @@
"url": "/_mozilla/mozilla/node_replaceChild.html"
}
],
"mozilla/out-of-order-stylesheet-loads-and-imports.html": [
{
"path": "mozilla/out-of-order-stylesheet-loads-and-imports.html",
"url": "/_mozilla/mozilla/out-of-order-stylesheet-loads-and-imports.html"
}
],
"mozilla/out-of-order-stylesheet-loads.html": [
{
"path": "mozilla/out-of-order-stylesheet-loads.html",
"url": "/_mozilla/mozilla/out-of-order-stylesheet-loads.html"
}
],
"mozilla/parentNode_querySelector.html": [
{
"path": "mozilla/parentNode_querySelector.html",

18
tests/wpt/mozilla/tests/mozilla/out-of-order-stylesheet-loads-and-imports.html Normal file
View file

@ -0,0 +1,18 @@
<!doctype html>
<meta charset="utf-8">
<title>Out-of-order stylesheet loads for the same element happen correctly, even with imports (issue #15101)</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
async_test(function(t) {
var link = document.createElement("link");
link.rel = "stylesheet";
link.href = "resources/imports-background-red.css?pipe=trickle(d3)";
document.head.appendChild(link);
link.href = "resources/imports-background-green.css";
t.step_timeout(function() {
assert_equals(getComputedStyle(document.body).getPropertyValue("background-color"), "rgb(0, 128, 0)");
t.done();
}, 4000);
}, "out-of-order stylesheet loads for the same element happen correctly, even with imports");
</script>

18
tests/wpt/mozilla/tests/mozilla/out-of-order-stylesheet-loads.html Normal file
View file

@ -0,0 +1,18 @@
<!doctype html>
<meta charset="utf-8">
<title>Out-of-order stylesheet loads for the same element happen correctly (issue #15101)</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
async_test(function(t) {
var link = document.createElement("link");
link.rel = "stylesheet";
link.href = "resources/background-red.css?pipe=trickle(d3)";
document.head.appendChild(link);
link.href = "resources/background-green.css";
t.step_timeout(function() {
assert_equals(getComputedStyle(document.body).getPropertyValue("background-color"), "rgb(0, 128, 0)");
t.done();
}, 4000);
}, "out-of-order stylesheet loads for the same element happen correctly");
</script>

3
tests/wpt/mozilla/tests/mozilla/resources/background-green.css Normal file
View file

@ -0,0 +1,3 @@
body {
background-color: green;
}

3
tests/wpt/mozilla/tests/mozilla/resources/background-red.css Normal file
View file

@ -0,0 +1,3 @@
body {
background-color: red;
}

1
tests/wpt/mozilla/tests/mozilla/resources/imports-background-green.css Normal file
View file

@ -0,0 +1 @@
@import url("background-green.css");

1
tests/wpt/mozilla/tests/mozilla/resources/imports-background-red.css Normal file
View file

@ -0,0 +1 @@
@import url("background-red.css");