Commit 2d81bf72 authored by Shane Caraveo's avatar Shane Caraveo
Browse files

Bug 1551744 move webnavigation modules to extensions component r=kmag

Differential Revision: https://phabricator.services.mozilla.com/D31167

--HG--
rename : toolkit/modules/addons/MatchURLFilters.jsm => toolkit/components/extensions/MatchURLFilters.jsm
rename : toolkit/modules/addons/WebNavigation.jsm => toolkit/components/extensions/WebNavigation.jsm
rename : toolkit/modules/addons/WebNavigationContent.js => toolkit/components/extensions/WebNavigationContent.js
rename : toolkit/modules/addons/WebNavigationFrames.jsm => toolkit/components/extensions/WebNavigationFrames.jsm
extra : moz-landing-system : lando
parent 5bc25455
......@@ -27,6 +27,7 @@ EXTRA_JS_MODULES += [
'ExtensionTelemetry.jsm',
'ExtensionUtils.jsm',
'FindContent.jsm',
'MatchURLFilters.jsm',
'MessageChannel.jsm',
'MessageManagerProxy.jsm',
'NativeManifests.jsm',
......@@ -34,6 +35,9 @@ EXTRA_JS_MODULES += [
'PerformanceCounters.jsm',
'ProxyScriptContext.jsm',
'Schemas.jsm',
'WebNavigation.jsm',
'WebNavigationContent.js',
'WebNavigationFrames.jsm',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] != "android":
......
"use strict";
module.exports = {
"extends": "../../components/extensions/.eslintrc.js",
};
......@@ -9,9 +9,6 @@ include('../components/telemetry/telemetry-constants.mozbuild')
with Files('**'):
BUG_COMPONENT = ('Toolkit', 'General')
with Files('addons/**'):
BUG_COMPONENT = ('WebExtensions', 'General')
with Files('docs/**'):
BUG_COMPONENT = ('Toolkit', 'Async Tooling')
......@@ -167,10 +164,6 @@ EXTRA_JS_MODULES += [
'ActorChild.jsm',
'ActorManagerChild.jsm',
'ActorManagerParent.jsm',
'addons/MatchURLFilters.jsm',
'addons/WebNavigation.jsm',
'addons/WebNavigationContent.js',
'addons/WebNavigationFrames.jsm',
'AppMenuNotifications.jsm',
'AsyncPrefs.jsm',
'AutoCompletePopupContent.jsm',
......
......@@ -2,9 +2,6 @@
support-files =
file_FinderIframeTest.html
file_FinderSample.html
file_WebNavigation_page1.html
file_WebNavigation_page2.html
file_WebNavigation_page3.html
file_getSelectionDetails_inputs.html
head.js
......@@ -28,7 +25,5 @@ skip-if = debug || os = "linux"
skip-if = debug || os = "linux"
[browser_Geometry.js]
[browser_InlineSpellChecker.js]
[browser_WebNavigation.js]
skip-if = true # Superseded by WebExtension tests
[browser_PromiseMessage.js]
[browser_Troubleshoot.js]
"use strict";
var {WebNavigation} = ChromeUtils.import("resource://gre/modules/WebNavigation.jsm");
const BASE = "http://example.com/browser/toolkit/modules/tests/browser";
const URL = BASE + "/file_WebNavigation_page1.html";
const FRAME = BASE + "/file_WebNavigation_page2.html";
const FRAME2 = BASE + "/file_WebNavigation_page3.html";
const EVENTS = [
"onBeforeNavigate",
"onCommitted",
"onDOMContentLoaded",
"onCompleted",
"onErrorOccurred",
"onReferenceFragmentUpdated",
];
const REQUIRED = [
"onBeforeNavigate",
"onCommitted",
"onDOMContentLoaded",
"onCompleted",
];
var expectedBrowser;
var received = [];
var completedResolve;
var waitingURL, waitingEvent;
var rootWindowID;
function gotEvent(event, details) {
if (!details.url.startsWith(BASE)) {
return;
}
info(`Got ${event} ${details.url} ${details.windowId} ${details.parentWindowId}`);
is(details.browser, expectedBrowser, "correct <browser> element");
received.push({url: details.url, event});
if (typeof(rootWindowID) == "undefined") {
rootWindowID = details.windowId;
}
if (details.url == URL) {
is(details.windowId, rootWindowID, "root window ID correct");
} else {
is(details.parentWindowId, rootWindowID, "parent window ID correct");
isnot(details.windowId, rootWindowID, "window ID probably okay");
}
isnot(details.windowId, undefined);
isnot(details.parentWindowId, undefined);
if (details.url == waitingURL && event == waitingEvent) {
completedResolve();
}
}
function loadViaFrameScript(url, event, script) {
// Loading via a frame script ensures that the chrome process never
// "gets ahead" of frame scripts in non-e10s mode.
received = [];
waitingURL = url;
waitingEvent = event;
expectedBrowser.messageManager.loadFrameScript("data:," + script, false);
return new Promise(resolve => { completedResolve = resolve; });
}
add_task(async function webnav_ordering() {
let listeners = {};
for (let event of EVENTS) {
listeners[event] = gotEvent.bind(null, event);
WebNavigation[event].addListener(listeners[event]);
}
gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
let browser = gBrowser.selectedBrowser;
expectedBrowser = browser;
await BrowserTestUtils.browserLoaded(browser);
await loadViaFrameScript(URL, "onCompleted", `content.location = "${URL}";`);
function checkRequired(url) {
for (let event of REQUIRED) {
let found = false;
for (let r of received) {
if (r.url == url && r.event == event) {
found = true;
}
}
ok(found, `Received event ${event} from ${url}`);
}
}
checkRequired(URL);
checkRequired(FRAME);
function checkBefore(action1, action2) {
function find(action) {
for (let i = 0; i < received.length; i++) {
if (received[i].url == action.url && received[i].event == action.event) {
return i;
}
}
return -1;
}
let index1 = find(action1);
let index2 = find(action2);
ok(index1 != -1, `Action ${JSON.stringify(action1)} happened`);
ok(index2 != -1, `Action ${JSON.stringify(action2)} happened`);
ok(index1 < index2, `Action ${JSON.stringify(action1)} happened before ${JSON.stringify(action2)}`);
}
checkBefore({url: URL, event: "onCommitted"}, {url: FRAME, event: "onBeforeNavigate"});
checkBefore({url: FRAME, event: "onCompleted"}, {url: URL, event: "onCompleted"});
await loadViaFrameScript(FRAME2, "onCompleted", `content.frames[0].location = "${FRAME2}";`);
checkRequired(FRAME2);
await loadViaFrameScript(FRAME2 + "#ref", "onReferenceFragmentUpdated",
"content.frames[0].document.getElementById('elt').click();");
info("Received onReferenceFragmentUpdated from FRAME2");
gBrowser.removeCurrentTab();
for (let event of EVENTS) {
WebNavigation[event].removeListener(listeners[event]);
}
});
<!DOCTYPE HTML>
<html>
<body>
<iframe src="file_WebNavigation_page2.html" width="200" height="200"></iframe>
</body>
</html>
<!DOCTYPE HTML>
<html>
<body>
<a id="elt" href="file_WebNavigation_page3.html#ref">click me</a>
</body>
</html>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment