Bug 1333990: Part 3e - Add tests for content script cache eviction. r?aswan,billm
MozReview-Commit-ID: 6SRI8xTuZk5
--- a/toolkit/components/extensions/ExtensionContent.jsm
+++ b/toolkit/components/extensions/ExtensionContent.jsm
@@ -109,28 +109,30 @@ const SCRIPT_EXPIRY_TIMEOUT_MS = 300000;
const SCRIPT_CLEAR_TIMEOUT_MS = 5000;
const scriptCaches = new WeakSet();
class ScriptCache extends DefaultMap {
constructor(options) {
super(url => ChromeUtils.compileScript(url, options));
+ this.expiryTimeout = SCRIPT_EXPIRY_TIMEOUT_MS;
+
scriptCaches.add(this);
}
get(url) {
let script = super.get(url);
script.lastUsed = Date.now();
if (script.timer) {
script.timer.cancel();
}
script.timer = Timer(this.delete.bind(this, url),
- SCRIPT_EXPIRY_TIMEOUT_MS,
+ this.expiryTimeout,
Ci.nsITimer.TYPE_ONE_SHOT);
return script;
}
delete(url) {
if (this.has(url)) {
super.get(url).timer.cancel();
--- a/toolkit/components/extensions/test/mochitest/mochitest-common.ini
+++ b/toolkit/components/extensions/test/mochitest/mochitest-common.ini
@@ -49,16 +49,17 @@ support-files =
[test_ext_clipboard.html]
# skip-if = # disabled test case with_permission_allow_copy, see inline comment.
[test_ext_inIncognitoContext_window.html]
skip-if = os == 'android' # Android does not support multiple windows.
[test_ext_geturl.html]
[test_ext_background_canvas.html]
[test_ext_content_security_policy.html]
[test_ext_contentscript_api_injection.html]
+[test_ext_contentscript_cache.html]
[test_ext_contentscript_context.html]
[test_ext_contentscript_create_iframe.html]
[test_ext_contentscript_devtools_metadata.html]
[test_ext_contentscript_drawWindow.html]
[test_ext_contentscript_exporthelpers.html]
[test_ext_contentscript_incognito.html]
skip-if = os == 'android' # Android does not support multiple windows.
[test_ext_contentscript_css.html]
new file mode 100644
--- /dev/null
+++ b/toolkit/components/extensions/test/mochitest/test_ext_contentscript_cache.html
@@ -0,0 +1,101 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <title>Test for content script caching</title>
+ <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+ <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+ <script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
+ <script type="text/javascript" src="head.js"></script>
+ <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+
+<script type="text/javascript">
+"use strict";
+
+add_task(function* test_contentscript_cache() {
+ let extension = ExtensionTestUtils.loadExtension({
+ manifest: {
+ content_scripts: [{
+ "matches": ["http://example.com/"],
+ "js": ["content_script.js"],
+ "run_at": "document_start",
+ }],
+ },
+
+ background() {
+ browser.test.sendMessage("origin", location.origin);
+ },
+
+ files: {
+ "content_script.js": function() {
+ browser.test.sendMessage("content-script-loaded");
+ },
+ },
+ });
+
+ yield extension.startup();
+
+ let origin = yield extension.awaitMessage("origin");
+ let scriptUrl = `${origin}/content_script.js`;
+
+ let {ExtensionManager} = SpecialPowers.Cu.import("resource://gre/modules/ExtensionContent.jsm", {});
+ let ext = ExtensionManager.extensions.get(extension.id);
+
+ ext.staticScripts.expiryTimeout = 3000;
+ is(ext.staticScripts.size, 0, "Should have no cached scripts");
+
+ let win = window.open("http://example.com/");
+ yield extension.awaitMessage("content-script-loaded");
+
+ is(ext.staticScripts.size, 1, "Should have one cached script");
+ ok(ext.staticScripts.has(scriptUrl), "Script cache should contain script URL");
+
+ let chromeScript, chromeScriptDone;
+ let {appinfo} = SpecialPowers.Services;
+ if (appinfo.processType === appinfo.PROCESS_TYPE_CONTENT) {
+ /* globals addMessageListener, assert */
+ chromeScript = SpecialPowers.loadChromeScript(() => {
+ addMessageListener("check-script-cache", extensionId => {
+ let {ExtensionManager} = Components.utils.import("resource://gre/modules/ExtensionContent.jsm", {});
+ let ext = ExtensionManager.extensions.get(extensionId);
+
+ assert.equal(ext.staticScripts.size, 0, "Should have no cached scripts in the parent process");
+
+ sendAsyncMessage("done");
+ });
+ });
+ chromeScript.sendAsyncMessage("check-script-cache", extension.id);
+ chromeScriptDone = chromeScript.promiseOneMessage("done");
+ }
+
+ SimpleTest.requestFlakyTimeout("Required to test expiry timeout");
+ yield new Promise(resolve => setTimeout(resolve, 3000));
+ is(ext.staticScripts.size, 0, "Should have no cached scripts");
+
+ if (chromeScript) {
+ yield chromeScriptDone;
+ chromeScript.destroy();
+ }
+
+ win.close();
+
+
+ win = window.open("http://example.com/");
+ yield extension.awaitMessage("content-script-loaded");
+
+ is(ext.staticScripts.size, 1, "Should have one cached script");
+ ok(ext.staticScripts.has(scriptUrl));
+
+ SpecialPowers.Services.obs.notifyObservers(null, "memory-pressure", "heap-minimize");
+
+ is(ext.staticScripts.size, 0, "Should have no cached scripts after heap-minimize");
+
+ win.close();
+
+ yield extension.unload();
+});
+</script>
+
+</body>
+</html>