mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1443344. Flag a parent sheet load as failed if an import is blocked by content policy. r=bholley 

MozReview-Commit-ID: AArgnuHbCYL
This commit is contained in:
Boris Zbarsky 2018-03-06 14:45:27 -05:00
Родитель ccac7d9846
Коммит 826d1e3167
5 изменённых файлов: 109 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
layout/style/Loader.cpp
Просмотреть файл

@ -2273,7 +2273,12 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
nsIPrincipal* principal = aParentSheet->Principal();
nsresult rv = CheckContentPolicy(loadingPrincipal, principal, aURL, context, false);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_WARN_IF(NS_FAILED(rv))) {
if (aParentData) {
MarkLoadTreeFailed(aParentData);
}
return rv;
}
nsCOMPtr<nsICSSLoaderObserver> observer;

1
layout/style/test/file_bug1443344.css Normal file
Просмотреть файл

@ -0,0 +1 @@
#importTarget { color: red ! important }

6
layout/style/test/mochitest.ini
Просмотреть файл

@ -173,6 +173,12 @@ support-files = file_bug1375944.html Ahem.ttf
support-files = bug1382568-iframe.html
[test_bug1394302.html]
skip-if = !stylo # This is a stylo test; gecko isn't deterministic here
[test_bug1443344-1.html]
scheme = https
support-files = file_bug1443344.css
[test_bug1443344-2.html]
scheme = https
support-files = file_bug1443344.css
[test_cascade.html]
[test_ch_ex_no_infloops.html]
[test_change_hint_optimizations.html]

48
layout/style/test/test_bug1443344-1.html Normal file
Просмотреть файл

@ -0,0 +1,48 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1443344
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 1443344</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript">
/** Test for Bug 1443344 **/
SimpleTest.waitForExplicitFinish();
var sheetURL = new URL("file_bug1443344.css", location.href);
sheetURL.protocol = "http";
var link = document.createElement("link");
link.href = `data:text/css,@import url("${sheetURL}");`
link.rel = "stylesheet";
var loadFired = false, errorFired = false;
link.onload = () => loadFired = true;
link.onerror = () => errorFired = true;
document.head.appendChild(link);
addLoadEvent(() => {
is(loadFired, false, "Should not fire onload for erroring @import");
is(errorFired, true, "Should fire onerror for erroring @import");
is(getComputedStyle($("importTarget")).color, "rgb(0, 255, 0)",
"Erroring sheet should not load");
SimpleTest.finish();
});
</script>
<style>
#importTarget { color: rgb(0, 255, 0); }
</style>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1443344">Mozilla Bug 1443344</a>
<p id="display"><div id="importTarget"></div></p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
</body>
</html>

48
layout/style/test/test_bug1443344-2.html Normal file
Просмотреть файл

@ -0,0 +1,48 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1443344
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 1443344</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript">
/** Test for Bug 1443344 **/
SimpleTest.waitForExplicitFinish();
var sheetURL = new URL("file_bug1443344.css", location.href);
sheetURL.protocol = "http";
var link = document.createElement("link");
link.href = `data:text/css,@import url("data:text/css,@import url('${sheetURL}');");`
link.rel = "stylesheet";
var loadFired = false, errorFired = false;
link.onload = () => loadFired = true;
link.onerror = () => errorFired = true;
document.head.appendChild(link);
addLoadEvent(() => {
is(loadFired, false, "Should not fire onload for erroring @import");
is(errorFired, true, "Should fire onerror for erroring @import");
is(getComputedStyle($("importTarget")).color, "rgb(0, 255, 0)",
"Erroring sheet should not load");
SimpleTest.finish();
});
</script>
<style>
#importTarget { color: rgb(0, 255, 0); }
</style>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1443344">Mozilla Bug 1443344</a>
<p id="display"><div id="importTarget"></div></p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
</body>
</html>