Moves nsSidebar.js to toolkit and makes it just pass messages to chrome for each API call. MainProcessSingleton listens for those messages and passes the call along to the search service. Combines the validation code into the same function and takes the opportunity to support relative URLs too. Adds a bunch of tests for these web APIs. Also fixes: Bug 518929: Implement window.external APIs in core code Bug 530847: Remove Fennec's nsISidebar implementation once that code is moved into the core Bug 517720: Adding a search engine using relative URIs is not supported
103 lines
3.9 KiB
JavaScript
103 lines
3.9 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
"use strict";
|
|
|
|
const { utils: Cu, interfaces: Ci, classes: Cc, results: Cr } = Components;
|
|
|
|
Cu.import("resource://gre/modules/Services.jsm");
|
|
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
|
|
XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
|
|
"@mozilla.org/parentprocessmessagemanager;1",
|
|
"nsIMessageListenerManager");
|
|
|
|
XPCOMUtils.defineLazyServiceGetter(this, "globalmm",
|
|
"@mozilla.org/globalmessagemanager;1",
|
|
"nsIMessageBroadcaster");
|
|
|
|
XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
|
|
"resource://gre/modules/NetUtil.jsm");
|
|
|
|
function MainProcessSingleton() {}
|
|
MainProcessSingleton.prototype = {
|
|
classID: Components.ID("{0636a680-45cb-11e4-916c-0800200c9a66}"),
|
|
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
|
|
Ci.nsISupportsWeakReference]),
|
|
|
|
logConsoleMessage: function(message) {
|
|
let logMsg = message.data;
|
|
logMsg.wrappedJSObject = logMsg;
|
|
Services.obs.notifyObservers(logMsg, "console-api-log-event", null);
|
|
},
|
|
|
|
// Called when a webpage calls either window.external.AddSearchProvider or
|
|
// window.sidebar.addSearchEngine
|
|
addSearchEngine: function({ target: browser, data: { pageURL, engineURL, iconURL, type } }) {
|
|
pageURL = NetUtil.newURI(pageURL);
|
|
engineURL = NetUtil.newURI(engineURL, null, pageURL);
|
|
|
|
if (iconURL) {
|
|
iconURL = NetUtil.newURI(iconURL, null, pageURL);
|
|
}
|
|
else {
|
|
let tabbrowser = browser.getTabBrowser();
|
|
if (browser.mIconURL && (!tabbrowser || tabbrowser.shouldLoadFavIcon(pageURL)))
|
|
iconURL = NetUtil.newURI(browser.mIconURL);
|
|
}
|
|
|
|
try {
|
|
// Make sure the URLs are HTTP, HTTPS, or FTP.
|
|
let isWeb = ["https", "http", "ftp"];
|
|
|
|
if (isWeb.indexOf(engineURL.scheme) < 0)
|
|
throw "Unsupported search engine URL: " + engineURL;
|
|
|
|
if (iconURL && isWeb.indexOf(iconURL.scheme) < 0)
|
|
throw "Unsupported search icon URL: " + iconURL;
|
|
}
|
|
catch(ex) {
|
|
Cu.reportError("Invalid argument passed to window.sidebar.addSearchEngine: " + ex);
|
|
|
|
var searchBundle = Services.strings.createBundle("chrome://global/locale/search/search.properties");
|
|
var brandBundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
|
|
var brandName = brandBundle.GetStringFromName("brandShortName");
|
|
var title = searchBundle.GetStringFromName("error_invalid_engine_title");
|
|
var msg = searchBundle.formatStringFromName("error_invalid_engine_msg",
|
|
[brandName], 1);
|
|
Services.ww.getNewPrompter(browser.ownerDocument.defaultView).alert(title, msg);
|
|
return;
|
|
}
|
|
|
|
Services.search.init(function(status) {
|
|
if (status != Cr.NS_OK)
|
|
return;
|
|
|
|
Services.search.addEngine(engineURL.spec, type, iconURL ? iconURL.spec : null, true);
|
|
})
|
|
},
|
|
|
|
observe: function(subject, topic, data) {
|
|
switch (topic) {
|
|
case "app-startup": {
|
|
Services.obs.addObserver(this, "xpcom-shutdown", false);
|
|
|
|
// Load this script early so that console.* is initialized
|
|
// before other frame scripts.
|
|
globalmm.loadFrameScript("chrome://global/content/browser-content.js", true);
|
|
ppmm.addMessageListener("Console:Log", this.logConsoleMessage);
|
|
globalmm.addMessageListener("Search:AddEngine", this.addSearchEngine);
|
|
break;
|
|
}
|
|
|
|
case "xpcom-shutdown":
|
|
ppmm.removeMessageListener("Console:Log", this.logConsoleMessage);
|
|
globalmm.removeMessageListener("Search:AddEngine", this.addSearchEngine);
|
|
break;
|
|
}
|
|
},
|
|
};
|
|
|
|
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([MainProcessSingleton]);
|