Bug 1462121 - Register pagehide/pageshow in system group
MozReview-Commit-ID: 4k2SoTnu7S1
--- a/toolkit/components/extensions/ExtensionCommon.jsm
+++ b/toolkit/components/extensions/ExtensionCommon.jsm
@@ -168,24 +168,24 @@ class BaseContext {
this.docShell = null;
this.contentWindow = null;
this.active = false;
});
}
};
onPageShow();
- contentWindow.addEventListener("pagehide", onPageHide, true);
- contentWindow.addEventListener("pageshow", onPageShow, true);
+ contentWindow.addEventListener("pagehide", onPageHide, {mozSystemGroup: true});
+ contentWindow.addEventListener("pageshow", onPageShow, {mozSystemGroup: true});
this.callOnClose({
close: () => {
onPageHide();
if (this.active) {
- contentWindow.removeEventListener("pagehide", onPageHide, true);
- contentWindow.removeEventListener("pageshow", onPageShow, true);
+ contentWindow.removeEventListener("pagehide", onPageHide, {mozSystemGroup: true});
+ contentWindow.removeEventListener("pageshow", onPageShow, {mozSystemGroup: true});
}
},
});
}
get cloneScope() {
throw new Error("Not implemented");
}
new file mode 100644
--- /dev/null
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_contentscript_context_isolation.js
@@ -0,0 +1,111 @@
+"use strict";
+
+/* globals exportFunction */
+/* eslint-disable mozilla/balanced-listeners */
+
+const server = createHttpServer({hosts: ["example.com", "example.org"]});
+
+server.registerPathHandler("/dummy", (request, response) => {
+ response.setStatusLine(request.httpVersion, 200, "OK");
+ response.setHeader("Content-Type", "text/html", false);
+ response.write("<!DOCTYPE html><html></html>");
+});
+
+server.registerPathHandler("/bfcachetestpage", (request, response) => {
+ response.setStatusLine(request.httpVersion, 200, "OK");
+ response.setHeader("Content-Type", "text/html;charset=utf-8", false);
+ response.write(`<!DOCTYPE html>
+<script>
+ window.addEventListener("pageshow", (event) => {
+ event.stopImmediatePropagation();
+ if (window.browserTestSendMessage) {
+ browserTestSendMessage("content-script-show");
+ }
+ });
+ window.addEventListener("pagehide", (event) => {
+ event.stopImmediatePropagation();
+ if (window.browserTestSendMessage) {
+ if (event.persisted) {
+ browserTestSendMessage("content-script-hide");
+ } else {
+ browserTestSendMessage("content-script-unload");
+ }
+ }
+ }, true);
+</script>`);
+});
+
+add_task(async function test_contentscript_context_isolation() {
+ function contentScript() {
+ browser.test.sendMessage("content-script-ready");
+
+ exportFunction(browser.test.sendMessage, window, {defineAs: "browserTestSendMessage"});
+
+ window.addEventListener("pageshow", () => {
+ browser.test.fail("pageshow should have been suppressed by stopImmediatePropagation");
+ });
+ window.addEventListener("pagehide", () => {
+ browser.test.fail("pagehide should have been suppressed by stopImmediatePropagation");
+ }, true);
+ }
+
+ let extension = ExtensionTestUtils.loadExtension({
+ manifest: {
+ content_scripts: [{
+ "matches": ["http://example.com/bfcachetestpage"],
+ "js": ["content_script.js"],
+ }],
+ },
+
+ files: {
+ "content_script.js": contentScript,
+ },
+ });
+
+ let contentPage = await ExtensionTestUtils.loadContentPage("http://example.com/bfcachetestpage");
+ await extension.startup();
+ await extension.awaitMessage("content-script-ready");
+
+ // Get the content script context and check that it points to the correct window.
+ await contentPage.spawn(extension.id, async extensionId => {
+ let {DocumentManager} = ChromeUtils.import("resource://gre/modules/ExtensionContent.jsm", {});
+ this.context = DocumentManager.getContext(extensionId, this.content);
+
+ Assert.ok(this.context, "Got content script context");
+
+ Assert.equal(this.context.contentWindow, this.content, "Context's contentWindow property is correct");
+
+ // Navigate so that the content page is hidden in the bfcache.
+
+ this.content.location = "http://example.org/dummy";
+ });
+
+ await extension.awaitMessage("content-script-hide");
+
+ await contentPage.spawn(null, async () => {
+ Assert.equal(this.context.contentWindow, null, "Context's contentWindow property is null");
+
+ // Navigate back so the content page is resurrected from the bfcache.
+ this.content.history.back();
+ });
+
+ await extension.awaitMessage("content-script-show");
+
+ await contentPage.spawn(null, async () => {
+ Assert.equal(this.context.contentWindow, this.content, "Context's contentWindow property is correct");
+
+ // Now add an "unload" event listener, which should prevent a page from entering the bfcache.
+ await new Promise((resolve) => {
+ this.content.addEventListener("unload", () => {
+ Assert.equal(this.context.contentWindow, null, "Context's contentWindow property is null");
+ resolve();
+ });
+ this.content.location = "http://example.org/dummy";
+ });
+ });
+
+ await extension.awaitMessage("content-script-unload");
+
+ await contentPage.close();
+ await extension.unload();
+});
--- a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
@@ -19,16 +19,17 @@ skip-if = os == "android"
[test_ext_browserSettings_homepage.js]
skip-if = os == "android"
[test_ext_cookieBehaviors.js]
[test_ext_content_security_policy.js]
[test_ext_contentscript_api_injection.js]
[test_ext_contentscript_async_loading.js]
skip-if = os == 'android' && debug # The generated script takes too long to load on Android debug
[test_ext_contentscript_context.js]
+[test_ext_contentscript_context_isolation.js]
[test_ext_contentscript_create_iframe.js]
[test_ext_contentscript_css.js]
[test_ext_contentscript_exporthelpers.js]
[test_ext_contentscript_teardown.js]
[test_ext_contextual_identities.js]
skip-if = os == "android" # Containers are not exposed to android.
[test_ext_debugging_utils.js]
[test_ext_dns.js]
