Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1436400 - Part 11: Modify test_script_loader_js_cache.html to test basic module script. r=nbp

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D140552
This commit is contained in:
Tooru Fujisawa 2022-03-15 19:05:57 +00:00
parent 141090b932
commit 5bbb605209
7 changed files with 104 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/base/test/.eslintrc.js
View File

@ -6,4 +6,12 @@ module.exports = {
"plugin:mozilla/chrome-test",
"plugin:mozilla/mochitest-test",
],
overrides: [
{
files: "file_module_js_cache.js",
parserOptions: {
sourceType: "module",
},
},
],
};

10
dom/base/test/file_module_js_cache.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Add a tag module script to save the bytecode</title>
</head>
<body>
<script id="watchme" type="module" src="file_module_js_cache.js"></script>
</body>
</html>

6
dom/base/test/file_module_js_cache.js Normal file
View File

@ -0,0 +1,6 @@
function baz() {}
function bar() {}
function foo() {
bar();
}
foo();

10
dom/base/test/file_module_js_cache_no_module.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Load the module script as a regular script</title>
</head>
<body>
<script id="watchme" src="file_module_js_cache.js"></script>
</body>
</html>

12
dom/base/test/file_module_js_cache_with_sri.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Add a tag module script to save the bytecode</title>
</head>
<body>
<script id="watchme" type="module" src="file_module_js_cache.js"
integrity="sha384-1eNjxPXQdMh9pdr8ctqxBCIqiAnwYWzCCIKpcEIWp2MjECaRYx5Iw1TC3p/dx/uj">
</script>
</body>
</html>

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

@ -753,6 +753,10 @@ support-files =
file_js_cache_with_sri.html
file_js_cache_module.html
file_js_cache.js
file_module_js_cache.html
file_module_js_cache_with_sri.html
file_module_js_cache_no_module.html
file_module_js_cache.js
file_js_cache_save_after_load.html
file_js_cache_save_after_load.js
file_js_cache_syntax_error.html

81
dom/base/test/test_script_loader_js_cache.html
View File

@ -27,10 +27,10 @@
},
"scriptloader_evaluate_module": {
"scriptloader_encode": {
"scriptloader_bytecode_saved": "bytecode_saved",
"scriptloader_bytecode_failed": "bytecode_failed"
"scriptloader_bytecode_saved": "module_bytecode_saved",
"scriptloader_bytecode_failed": "module_bytecode_failed"
},
"scriptloader_no_encode": "source_exec"
"scriptloader_no_encode": "module_source_exec"
},
},
"scriptloader_load_bytecode": {
@ -44,10 +44,18 @@
"scriptloader_bytecode_failed": "fallback_bytecode_failed"
},
"scriptloader_no_encode": "fallback_source_exec"
}
},
"scriptloader_evaluate_module": {
"scriptloader_encode": {
"scriptloader_bytecode_saved": "module_fallback_bytecode_saved",
"scriptloader_bytecode_failed": "module_fallback_bytecode_failed",
},
"scriptloader_no_encode": "module_fallback_source_exec",
},
}
},
"scriptloader_execute": "bytecode_exec"
"scriptloader_execute": "bytecode_exec",
"scriptloader_evaluate_module": "module_bytecode_exec",
}
};
@ -111,7 +119,10 @@
return statePromise;
}
promise_test(async function() {
async function basicTest(isModule) {
const prefix = isModule ? "module_" : "";
const name = isModule ? "module" : "script";
// Setting dom.expose_test_interfaces pref causes the
// nsScriptLoadRequest to fire event on script tags, with information
// about its internal state. The ScriptLoader source send events to
@ -131,44 +142,60 @@
// Load the test page, and verify that the code path taken by the
// nsScriptLoadRequest corresponds to the code path which is loading a
// source and saving it as bytecode.
var stateMachineResult = WaitForScriptTagEvent("file_js_cache.html");
assert_equals(await stateMachineResult, "bytecode_saved",
"[1] ScriptLoadRequest status after the first visit");
var stateMachineResult = WaitForScriptTagEvent(`file_${prefix}js_cache.html`);
assert_equals(await stateMachineResult, `${prefix}bytecode_saved`,
`[1-${name}] ScriptLoadRequest status after the first visit`);
// Reload the same test page, and verify that the code path taken by
// the nsScriptLoadRequest corresponds to the code path which is
// loading bytecode and executing it.
stateMachineResult = WaitForScriptTagEvent("file_js_cache.html");
assert_equals(await stateMachineResult, "bytecode_exec",
"[2] ScriptLoadRequest status after the second visit");
stateMachineResult = WaitForScriptTagEvent(`file_${prefix}js_cache.html`);
assert_equals(await stateMachineResult, `${prefix}bytecode_exec`,
`[2-${name}] ScriptLoadRequest status after the second visit`);
// Load another page which loads the same script with an SRI, while
// the cached bytecode does not have any. This should fallback to
// loading the source before saving the bytecode once more.
stateMachineResult = WaitForScriptTagEvent("file_js_cache_with_sri.html");
assert_equals(await stateMachineResult, "fallback_bytecode_saved",
"[3] ScriptLoadRequest status after the SRI hash");
stateMachineResult = WaitForScriptTagEvent(`file_${prefix}js_cache_with_sri.html`);
assert_equals(await stateMachineResult, `${prefix}fallback_bytecode_saved`,
`[3-${name}] ScriptLoadRequest status after the SRI hash`);
// Loading a page, which has the same SRI should verify the SRI and
// continue by executing the bytecode.
var stateMachineResult1 = WaitForScriptTagEvent("file_js_cache_with_sri.html");
var stateMachineResult1 = WaitForScriptTagEvent(`file_${prefix}js_cache_with_sri.html`);
// Loading a page which does not have a SRI while we have one in the
// cache should not change anything. We should also be able to load
// the cache simultanesouly.
var stateMachineResult2 = WaitForScriptTagEvent("file_js_cache.html");
var stateMachineResult2 = WaitForScriptTagEvent(`file_${prefix}js_cache.html`);
assert_equals(await stateMachineResult1, "bytecode_exec",
"[4] ScriptLoadRequest status after same SRI hash");
assert_equals(await stateMachineResult2, "bytecode_exec",
"[5] ScriptLoadRequest status after visit with no SRI");
assert_equals(await stateMachineResult1, `${prefix}bytecode_exec`,
`[4-${name}] ScriptLoadRequest status after same SRI hash`);
assert_equals(await stateMachineResult2, `${prefix}bytecode_exec`,
`[5-${name}] ScriptLoadRequest status after visit with no SRI`);
// Load a page that uses the same script as a module and verify that we
// re-parse it from source.
stateMachineResult = WaitForScriptTagEvent("file_js_cache_module.html");
assert_equals(await stateMachineResult, "bytecode_saved",
"[6] ScriptLoadRequest status for a module");
}, "Check the JS bytecode cache");
if (!isModule) {
// Load a page that uses the same script as a module and verify that we
// re-parse it from source.
stateMachineResult = WaitForScriptTagEvent("file_js_cache_module.html");
assert_equals(await stateMachineResult, "module_bytecode_saved",
`[6-${name}] ScriptLoadRequest status for a module`);
} else {
// Load a page that uses the same module script as a regular script and
// verify that we re-parse it from source.
stateMachineResult = WaitForScriptTagEvent("file_module_js_cache_no_module.html");
assert_equals(await stateMachineResult, "bytecode_saved",
`[6-${name}] ScriptLoadRequest status for a script`);
}
}
promise_test(async function() {
await basicTest(false);
}, "Check the JS bytecode cache for script");
promise_test(async function() {
await basicTest(true);
}, "Check the JS bytecode cache for module");
promise_test(async function() {
// (see above)