Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1330900 - Implement <script nomodule>, r=bz

Browse Source 
This patch implements:
. noModule getter/setter for HTMLScriptElement
. the nomodule attribute for HTMLScriptElement
. and the logic in nsScriptLoader that denies the loading of a nomodule script
. with tests
This commit is contained in:
Andrea Marchesini 2017-05-04 10:24:13 +02:00
parent 4e49debee8
commit 2743450ad5
9 changed files with 164 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/base/nsGkAtomList.h
View File

@ -663,6 +663,7 @@ GK_ATOM(noembed, "noembed")
GK_ATOM(noframes, "noframes")
GK_ATOM(nohref, "nohref")
GK_ATOM(noisolation, "noisolation")
GK_ATOM(nomodule, "nomodule")
GK_ATOM(nonce, "nonce")
GK_ATOM(none, "none")
GK_ATOM(noresize, "noresize")

15
dom/base/nsScriptLoader.cpp
View File

@ -1602,7 +1602,7 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement)
nsCOMPtr<nsIContent> scriptContent = do_QueryInterface(aElement);
// Step 12. Check that the script is not an eventhandler
// Step 13. Check that the script is not an eventhandler
if (IsScriptEventHandler(scriptContent)) {
return false;
}
@ -1636,7 +1636,18 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement)
}
}
// Step 14. in the HTML5 spec
// "In modern user agents that support module scripts, the script element with
// the nomodule attribute will be ignored".
// "The nomodule attribute must not be specified on module scripts (and will
// be ignored if it is)."
if (ModuleScriptsEnabled() &&
scriptKind == nsScriptKind::Classic &&
scriptContent->IsHTMLElement() &&
scriptContent->HasAttr(kNameSpaceID_None, nsGkAtoms::nomodule)) {
return false;
}
// Step 15. and later in the HTML5 spec
nsresult rv = NS_OK;
RefPtr<nsScriptLoadRequest> request;
if (aElement->GetScriptExternal()) {

12
dom/html/HTMLScriptElement.cpp
View File

@ -220,6 +220,18 @@ HTMLScriptElement::SetAsync(bool aValue, ErrorResult& rv)
SetHTMLBoolAttr(nsGkAtoms::async, aValue, rv);
}
bool
HTMLScriptElement::NoModule()
{
return GetBoolAttr(nsGkAtoms::nomodule);
}
void
HTMLScriptElement::SetNoModule(bool aValue, ErrorResult& aRv)
{
SetHTMLBoolAttr(nsGkAtoms::nomodule, aValue, aRv);
}
nsresult
HTMLScriptElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify)

2
dom/html/HTMLScriptElement.h
View File

@ -90,6 +90,8 @@ public:
}
bool Async();
void SetAsync(bool aValue, ErrorResult& rv);
bool NoModule();
void SetNoModule(bool aValue, ErrorResult& rv);
protected:
virtual ~HTMLScriptElement();

42
dom/html/test/file_script_module.html Normal file
View File

@ -0,0 +1,42 @@
<html>
<body>
<script>
// Helper methods.
function ok(a, msg) {
parent.postMessage({ check: !!a, msg }, "*")
}
function is(a, b, msg) {
ok(a === b, msg);
}
function finish() {
parent.postMessage({ done: true }, "*");
}
</script>
<script id="a" nomodule>42</script>
<script id="b">42</script>
<script>
// Let's test the behavior of nomodule attribute and noModule getter/setter.
var a = document.getElementById("a");
is(a.noModule, true, "HTMLScriptElement with nomodule attribute has noModule set to true");
a.removeAttribute("nomodule");
is(a.noModule, false, "HTMLScriptElement without nomodule attribute has noModule set to false");
a.noModule = true;
ok(a.hasAttribute('nomodule'), "HTMLScriptElement.noModule = true add the nomodule attribute");
var b = document.getElementById("b");
is(b.noModule, false, "HTMLScriptElement without nomodule attribute has noModule set to false");
b.noModule = true;
ok(b.hasAttribute('nomodule'), "HTMLScriptElement.noModule = true add the nomodule attribute");
</script>
<script>var foo = 42;</script>
<script nomodule>foo = 43;</script>
<script>
is(foo, 42, "nomodule HTMLScriptElements should not be executed in modern browsers");
finish();
</script>
</body>
</html>

32
dom/html/test/file_script_nomodule.html Normal file
View File

@ -0,0 +1,32 @@
<html>
<body>
<script>
// Helper methods.
function ok(a, msg) {
parent.postMessage({ check: !!a, msg }, "*")
}
function is(a, b, msg) {
ok(a === b, msg);
}
function finish() {
parent.postMessage({ done: true }, "*");
}
</script>
<script id="a" nomodule>42</script>
<script>
// Let's test the behavior of nomodule attribute and noModule getter/setter.
var a = document.getElementById("a");
ok(!("noModule" in a), "When modules are disabled HTMLScriptElement.noModule is not defined");
</script>
<script>var foo = 42;</script>
<script nomodule>foo = 43;</script>
<script>
is(foo, 43, "nomodule attribute is ignored when modules are disabled");
finish();
</script>
</body>
</html>

4
dom/html/test/mochitest.ini
View File

@ -608,3 +608,7 @@ skip-if = os == "android" # up/down arrow keys not supported on android
[test_bug1310865.html]
[test_bug1315146.html]
[test_fakepath.html]
[test_script_module.html]
support-files =
file_script_module.html
file_script_nomodule.html

56
dom/html/test/test_script_module.html Normal file
View File

@ -0,0 +1,56 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test for HTMLScriptElement with nomodule attribute</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script>
onmessage = (e) => {
if ("done" in e.data) {
next();
} else if ("check" in e.data) {
ok(e.data.check, e.data.msg);
} else {
ok(false, "Unknown message");
}
}
var tests = [
function() {
SpecialPowers.pushPrefEnv({"set":[["dom.moduleScripts.enabled", true]]})
.then(() => {
var ifr = document.createElement('iframe');
ifr.src = "file_script_module.html";
document.body.appendChild(ifr);
});
},
function() {
SpecialPowers.pushPrefEnv({"set":[["dom.moduleScripts.enabled", false]]})
.then(() => {
var ifr = document.createElement('iframe');
ifr.src = "file_script_nomodule.html";
document.body.appendChild(ifr);
});
},
];
SimpleTest.waitForExplicitFinish();
next();
function next() {
if (!tests.length) {
SimpleTest.finish();
return;
}
var test = tests.shift();
test();
}
</script>
</body>
</html>

2
dom/webidl/HTMLScriptElement.webidl
View File

@ -14,6 +14,8 @@ interface HTMLScriptElement : HTMLElement {
attribute DOMString src;
[SetterThrows]
attribute DOMString type;
[SetterThrows, Pref="dom.moduleScripts.enabled"]
attribute boolean noModule;
[SetterThrows]
attribute DOMString charset;
[SetterThrows]