Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 6a904e8a06a7 (bug 1272890) for timing out in test_ext_tab_teardown.html. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2016-10-26 19:01:38 +02:00
parent 1eefd99be6
commit 7e75e60f1f
4 changed files with 7 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
toolkit/components/extensions/ExtensionContent.jsm
View File

@ -101,7 +101,6 @@ function Script(extension, options, deferred = PromiseUtils.defer()) {
this.js = this.options.js || [];
this.css = this.options.css || [];
this.remove_css = this.options.remove_css;
this.match_about_blank = this.options.match_about_blank;
this.deferred = deferred;
@ -141,12 +140,6 @@ Script.prototype = {
return false;
}
if (this.match_about_blank && ["about:blank", "about:srcdoc"].includes(uri.spec)) {
// When matching about:blank/srcdoc documents, the checks below
// need to be performed against the "owner" document's URI.
uri = window.document.nodePrincipal.URI;
}
if (!(this.matches_.matches(uri) || this.matches_host_.matchesIgnoringPath(uri))) {
return false;
}
@ -173,6 +166,8 @@ Script.prototype = {
return false;
}
// TODO: match_about_blank.
return true;
},
@ -431,13 +426,11 @@ DocumentManager = {
extensionPageWindows: new Map(),
init() {
Services.obs.addObserver(this, "content-document-global-created", false);
Services.obs.addObserver(this, "document-element-inserted", false);
Services.obs.addObserver(this, "inner-window-destroyed", false);
},
uninit() {
Services.obs.removeObserver(this, "content-document-global-created");
Services.obs.removeObserver(this, "document-element-inserted");
Services.obs.removeObserver(this, "inner-window-destroyed");
},
@ -454,27 +447,13 @@ DocumentManager = {
},
observe: function(subject, topic, data) {
// For some types of documents (about:blank), we only see the first
// notification, for others (data: URIs) we only observe the second.
if (topic == "content-document-global-created" || topic == "document-element-inserted") {
if (topic == "document-element-inserted") {
let document = subject;
let window = document && document.defaultView;
if (topic == "content-document-global-created") {
window = subject;
document = window && window.document;
}
if (!document || !document.location || !window) {
return;
}
// Make sure we always load exactly once (notice != used as logical XOR),
// usually on document-element-inserted, except for about:blank documents.
if ((topic == "content-document-global-created") != (window.location.href == "about:blank")) {
return;
}
// Make sure we only load into frames that ExtensionContent.init
// was called on (i.e., not frames for social or sidebars).
let mm = getWindowMessageManager(window);
@ -503,8 +482,7 @@ DocumentManager = {
}
}
this.trigger(window);
this.trigger("document_start", window);
/* eslint-disable mozilla/balanced-listeners */
window.addEventListener("DOMContentLoaded", this, true);
window.addEventListener("load", this, true);
@ -548,9 +526,9 @@ DocumentManager = {
// Need to check if we're still on the right page? Greasemonkey does this.
if (event.type == "DOMContentLoaded") {
this.trigger(window);
this.trigger("document_end", window);
} else if (event.type == "load") {
this.trigger(window);
this.trigger("document_idle", window);
}
},
@ -688,7 +666,7 @@ DocumentManager = {
}
},
trigger(window) {
trigger(when, window) {
let state = this.getWindowState(window);
if (state == "document_start") {

10
toolkit/components/extensions/test/mochitest/file_with_about_blank.html
View File

@ -1,10 +0,0 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
</head>
<body>
<iframe id="a_b" src="about:blank"></iframe>
<iframe srcdoc="galactica actual" src="adama"></iframe>
</body>
</html>

3
toolkit/components/extensions/test/mochitest/mochitest.ini
View File

@ -18,7 +18,6 @@ support-files =
file_WebNavigation_page1.html
file_WebNavigation_page2.html
file_WebNavigation_page3.html
file_with_about_blank.html
file_image_good.png
file_image_bad.png
file_image_redirect.png
@ -51,8 +50,6 @@ skip-if = os == 'android' # Android does not currently support windows.
[test_ext_contentscript_devtools_metadata.html]
[test_ext_contentscript_exporthelpers.html]
[test_ext_contentscript_css.html]
[test_ext_contentscript_about_blank.html]
skip-if = (os == 'android') # bug 1312357
[test_ext_contentscript_teardown.html]
skip-if = (os == 'android') # Android does not support tabs API. Bug 1260250
[test_ext_exclude_include_globs.html]

117
toolkit/components/extensions/test/mochitest/test_ext_contentscript_about_blank.html
View File

@ -1,117 +0,0 @@
<!doctype html>
<html>
<head>
<title>Test content script match_about_blank option</title>
<script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.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_about_blank() {
const manifest = {
content_scripts: [
{
match_about_blank: true,
matches: ["http://mochi.test/*/file_with_about_blank.html", "http://example.com/*"],
all_frames: true,
css: ["all.css"],
js: ["all.js"],
}, {
matches: ["http://mochi.test/*/file_with_about_blank.html"],
css: ["mochi_without.css"],
js: ["mochi_without.js"],
all_frames: true,
}, {
match_about_blank: true,
matches: ["http://mochi.test/*/file_with_about_blank.html"],
css: ["mochi_with.css"],
js: ["mochi_with.js"],
all_frames: true,
},
],
};
const files = {
"all.js": function() {
browser.runtime.sendMessage("all");
},
"all.css": `
body { color: red; }
`,
"mochi_without.js": function() {
browser.runtime.sendMessage("mochi_without");
},
"mochi_without.css": `
body { background: yellow; }
`,
"mochi_with.js": function() {
browser.runtime.sendMessage("mochi_with");
},
"mochi_with.css": `
body { text-align: right; }
`,
};
function background() {
browser.runtime.onMessage.addListener((script, {url}) => {
const kind = url.startsWith("about:") ? url : "top";
browser.test.sendMessage("script", [script, kind, url]);
browser.test.sendMessage(`${script}:${kind}`);
});
}
const PATH = "tests/toolkit/components/extensions/test/mochitest/file_with_about_blank.html";
const extension = ExtensionTestUtils.loadExtension({manifest, files, background});
yield extension.startup();
let count = 0;
extension.onMessage("script", script => {
info(`script ran: ${script}`);
count++;
});
let win = window.open("http://example.com/" + PATH);
yield Promise.all([
extension.awaitMessage("all:top"),
extension.awaitMessage("all:about:blank"),
extension.awaitMessage("all:about:srcdoc"),
]);
is(count, 3, "exactly 3 scripts ran");
win.close();
win = window.open("http://mochi.test:8888/" + PATH);
yield Promise.all([
extension.awaitMessage("all:top"),
extension.awaitMessage("all:about:blank"),
extension.awaitMessage("all:about:srcdoc"),
extension.awaitMessage("mochi_without:top"),
extension.awaitMessage("mochi_with:top"),
extension.awaitMessage("mochi_with:about:blank"),
extension.awaitMessage("mochi_with:about:srcdoc"),
]);
let style = win.getComputedStyle(win.document.body);
is(style.color, "rgb(255, 0, 0)", "top window text color is red");
is(style.backgroundColor, "rgb(255, 255, 0)", "top window background is yellow");
is(style.textAlign, "right", "top window text is right-aligned");
let a_b = win.document.getElementById("a_b");
style = a_b.contentWindow.getComputedStyle(a_b.contentDocument.body);
is(style.color, "rgb(255, 0, 0)", "about:blank iframe text color is red");
is(style.backgroundColor, "transparent", "about:blank iframe background is transparent");
is(style.textAlign, "right", "about:blank text is right-aligned");
is(count, 10, "exactly 7 more scripts ran");
win.close();
yield extension.unload();
});
</script>
</body>
</html>