Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement support for removing stylesheets from their document #14930

Merged
merged 4 commits into from Jan 24, 2017
+180 −24
Merged

Implement support for removing stylesheets from their document #14930

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9760ea2
Test changing style tag elements
Jan 9, 2017
b3ce08f
Remove styles when link node is removed from document
Jan 9, 2017
f0c72cb
Removing style element's styles when elements is removed from dom
Jan 9, 2017
d4ddafd
Remove fail expectations from subresource integrity test
Jan 21, 2017
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

11 components/script/dom/htmllinkelement.rs
View file
Open in desktop
@@ -18,7 +18,7 @@ use dom::element::{AttributeMutation, Element, ElementCreator};
use dom::element::{cors_setting_for_element, reflect_cross_origin_attribute, set_cross_origin_attribute};
use dom::globalscope::GlobalScope;
use dom::htmlelement::HTMLElement;
use dom::node::{Node, document_from_node, window_from_node};
use dom::node::{Node, UnbindContext, document_from_node, window_from_node};
use dom::stylesheet::StyleSheet as DOMStyleSheet;
use dom::virtualmethods::VirtualMethods;
use html5ever_atoms::LocalName;
@@ -213,6 +213,15 @@ impl VirtualMethods for HTMLLinkElement {
}
}
}

fn unbind_from_tree(&self, context: &UnbindContext) {
if let Some(ref s) = self.super_type() {
s.unbind_from_tree(context);
}

let document = document_from_node(self);
document.invalidate_stylesheets();
}
}


11 components/script/dom/htmlstyleelement.rs
View file
Open in desktop
@@ -15,7 +15,7 @@ use dom::document::Document;
use dom::element::{Element, ElementCreator};
use dom::eventtarget::EventTarget;
use dom::htmlelement::HTMLElement;
use dom::node::{ChildrenMutation, Node, document_from_node, window_from_node};
use dom::node::{ChildrenMutation, Node, UnbindContext, document_from_node, window_from_node};
use dom::stylesheet::StyleSheet as DOMStyleSheet;
use dom::virtualmethods::VirtualMethods;
use html5ever_atoms::LocalName;
@@ -161,6 +161,15 @@ impl VirtualMethods for HTMLStyleElement {
self.parse_own_css();
}
}

fn unbind_from_tree(&self, context: &UnbindContext) {
if let Some(ref s) = self.super_type() {
s.unbind_from_tree(context);
}

let doc = document_from_node(self);
doc.invalidate_stylesheets();
}
}

impl StylesheetOwner for HTMLStyleElement {
22 tests/wpt/metadata/subresource-integrity/subresource-integrity.sub.html.ini
View file
Open in desktop
@@ -3,25 +3,3 @@
expected: OK
[Style: Same-origin with correct sha256 and sha512 hash, rel='alternate stylesheet' enabled]
expected: FAIL

[Style: Same-origin with incorrect hash.]
expected: FAIL

[Style: Same-origin with sha256 match, sha512 mismatch]
expected: FAIL

[Style: <crossorigin='anonymous'> with CORS-ineligible resource]
expected: FAIL

[Style: Cross-origin, not CORS request, with correct hash]
expected: FAIL

[Style: Cross-origin, not CORS request, with hash mismatch]
expected: FAIL

[Style: <crossorigin='use-credentials'> with incorrect hash CORS-eligible]
expected: FAIL

[Style: <crossorigin='anonymous'> with incorrect hash, ACAO: *]
expected: FAIL

72 tests/wpt/mozilla/meta/MANIFEST.json
View file
Open in desktop
@@ -6462,6 +6462,42 @@
"url": "/_mozilla/mozilla/iframe/resize_after_load.html"
}
],
"mozilla/remove_link_styles.html": [
{
"path": "mozilla/remove_link_styles.html",
"references": [
[
"/_mozilla/mozilla/remove_link_styles_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/remove_link_styles.html"
}
],
"mozilla/remove_style_styles.html": [
{
"path": "mozilla/remove_style_styles.html",
"references": [
[
"/_mozilla/mozilla/remove_style_styles_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/remove_style_styles.html"
}
],
"mozilla/reparse_style_elements.html": [
{
"path": "mozilla/reparse_style_elements.html",
"references": [
[
"/_mozilla/mozilla/reparse_style_elements_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/reparse_style_elements.html"
}
],
"mozilla/restyle-out-of-document.html": [
{
"path": "mozilla/restyle-out-of-document.html",
"url": "/_mozilla/mozilla/iframe/resize_after_load.html"
}
],
"mozilla/remove_link_styles.html": [
{
"path": "mozilla/remove_link_styles.html",
"references": [
[
"/_mozilla/mozilla/remove_link_styles_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/remove_link_styles.html"
}
],
"mozilla/remove_style_styles.html": [
{
"path": "mozilla/remove_style_styles.html",
"references": [
[
"/_mozilla/mozilla/remove_style_styles_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/remove_style_styles.html"
}
],
"mozilla/reparse_style_elements.html": [
{
"path": "mozilla/reparse_style_elements.html",
"references": [
[
"/_mozilla/mozilla/reparse_style_elements_ref.html",
"=="
]
],
"url": "/_mozilla/mozilla/reparse_style_elements.html"
}
],
"mozilla/restyle-out-of-document.html": [
{
"path": "mozilla/restyle-out-of-document.html",
4 tests/wpt/mozilla/tests/mozilla/remove_link_styles.css
View file
Open in desktop
@@ -0,0 +1,4 @@
body {
background-color: red;
color: white !important;
}
19 tests/wpt/mozilla/tests/mozilla/remove_link_styles.html
View file
Open in desktop
@@ -0,0 +1,19 @@
<!doctype html>
<meta charset="utf-8">
<title>Removing link tag should remove associated styles</title>
<link rel="stylesheet" type="text/css" href="remove_link_styles.css">
<link rel="match" href="remove_link_styles_ref.html">
<body>
<style>
body {
color: green;
}
</style>

This text should be green and the background should not be red.

<script>
var l = document.querySelector('link[rel="stylesheet"]');
l.parentNode.removeChild(l);

This comment has been minimized.

Sign in to view
Copy link
@emilio

emilio Jan 21, 2017

Member

The color part of this tests is useless because the second <style> element will override it no matter what.

Could you instead use color: white !important?

This comment has been minimized.

Sign in to view
Copy link
@emilio

emilio Jan 21, 2017

Member

In the loaded stylesheet I mean, of course.

This comment has been minimized.

Sign in to view
Copy link
@zaynetro

zaynetro Jan 22, 2017

Author

Done
</script>
</body>
11 tests/wpt/mozilla/tests/mozilla/remove_link_styles_ref.html
View file
Open in desktop
@@ -0,0 +1,11 @@
<!doctype html>
<meta charset="utf-8">
<body>
<style>
body {
color: green;
}
</style>

This text should be green and the background should not be red.
</body>
20 tests/wpt/mozilla/tests/mozilla/remove_style_styles.html
View file
Open in desktop
@@ -0,0 +1,20 @@
<!doctype html>
<meta charset="utf-8">
<title>Removing style element should remove all associated styles</title>
<link rel="match" href="remove_style_styles_ref.html">
<body>
<style>
body {
background-color: red;
}
</style>

This text should be black and the background should not be red.

<script>
// Force restyling
window.getComputedStyle(document.body);
var s = document.querySelector('style');
s.parentNode.removeChild(s);
</script>
</body>
5 tests/wpt/mozilla/tests/mozilla/remove_style_styles_ref.html
View file
Open in desktop
@@ -0,0 +1,5 @@
<!doctype html>
<meta charset="utf-8">
<body>
This text should be black and the background should not be red.
</body>
18 tests/wpt/mozilla/tests/mozilla/reparse_style_elements.html
View file
Open in desktop
@@ -0,0 +1,18 @@
<!doctype html>
<meta charset="utf-8">
<title>Style elements should be reparsed on change</title>
<link rel="match" href="reparse_style_elements_ref.html">
<body>
<style>
body {
background-color: red;
}
</style>

This text should be green and the background should not be red.

<script>
var s = document.querySelector('body > style');
s.textContent = 'body { color: green; }';
</script>
</body>
11 tests/wpt/mozilla/tests/mozilla/reparse_style_elements_ref.html
View file
Open in desktop
@@ -0,0 +1,11 @@
<!doctype html>
<meta charset="utf-8">
<body>
<style>
body {
color: green;
}
</style>

This text should be green and the background should not be red.
</body>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.