forked from mirrors/gecko-dev
This is a rollup of all the patches that have landed on the cedar project branch:891252fdd0Bug 1492475 - Part 1: Migrate most, if not all nsSearchService consumers to use async APIs. r=florian79b2eb2367Bug 1492475 - Part 2: Move nsIBrowserSearchService.idl to toolkit/components/search/nsISearchService.idl and update references. r=floriana947d3cdf0Bug 1492475 - Part 3: The search service init() method should simply return a Promise. r=florianc1e172dfacBug 1492475 - Part 4: Remove the synchronous initialization flow. r=floriancd41189eacBug 1492475 - Part 5: Since async initialization of the search service now is implicit behavior, remove the distinctive verbiage used internally. r=florian2ae7189dfaBug 1492475 - Part 6: Update the cache build task to work with an actual Promise and re-initialize only once at the same time - all to fix race conditions here. r=florianc8ee92973fBug 1492475 - Part 7: Make the region fetch not block the init flow, to ensure it's as fast as possible. r=florianc44e674e16Bug 1492475 - Part 8: Introduce an init flag, which can only be used privately, that allows to explicitly skip waiting for the region check process to complete. r=florian6c79eaf1d3Bug 1492475 - Part 9: Update unit tests to stop using 'currentEngine', in favor of 'defaultEngine'. r=Standard821b3aa17eeBug 1492475 - Part 10: Update unit tests to be fully aware of the new, async signatures of the search service API and remove sync init flow tests. r=mkaply,floriance5ba69019Bug 1492475 - Part 11: Repair incorrect usage of the `identifier` property of nsISearchEngine instances. r=florianfd177a7994Bug 1518543 - Fix up the Android (Fennec) nsISearchService shim to work with the new asynchronous API. r=florian3653d8ee22Bug 1523708 - Change the search service interaction in the show-heartbeat action to use the new async API. r=florian Differential Revision: https://phabricator.services.mozilla.com/D18355 --HG-- rename : netwerk/base/nsIBrowserSearchService.idl => toolkit/components/search/nsISearchService.idl extra : moz-landing-system : lando
98 lines
3.4 KiB
JavaScript
98 lines
3.4 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/. */
|
|
|
|
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* vim: set sts=2 sw=2 et tw=80: */
|
|
|
|
"use strict";
|
|
|
|
ChromeUtils.defineModuleGetter(this, "Services",
|
|
"resource://gre/modules/Services.jsm");
|
|
|
|
XPCOMUtils.defineLazyModuleGetters(this, {
|
|
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
|
|
});
|
|
|
|
XPCOMUtils.defineLazyPreferenceGetter(this, "searchLoadInBackground",
|
|
"browser.search.context.loadInBackground");
|
|
|
|
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch", "btoa"]);
|
|
|
|
var {
|
|
ExtensionError,
|
|
} = ExtensionUtils;
|
|
|
|
async function getDataURI(resourceURI) {
|
|
let response = await fetch(resourceURI);
|
|
let buffer = await response.arrayBuffer();
|
|
let contentType = response.headers.get("content-type");
|
|
let bytes = new Uint8Array(buffer);
|
|
let str = String.fromCharCode.apply(null, bytes);
|
|
return `data:${contentType};base64,${btoa(str)}`;
|
|
}
|
|
|
|
this.search = class extends ExtensionAPI {
|
|
getAPI(context) {
|
|
return {
|
|
search: {
|
|
async get() {
|
|
await searchInitialized;
|
|
let visibleEngines = await Services.search.getVisibleEngines();
|
|
let defaultEngine = await Services.search.getDefault();
|
|
return Promise.all(visibleEngines.map(async engine => {
|
|
let favIconUrl;
|
|
if (engine.iconURI) {
|
|
if (engine.iconURI.schemeIs("resource") ||
|
|
engine.iconURI.schemeIs("chrome")) {
|
|
// Convert internal URLs to data URLs
|
|
favIconUrl = await getDataURI(engine.iconURI.spec);
|
|
} else {
|
|
favIconUrl = engine.iconURI.spec;
|
|
}
|
|
}
|
|
|
|
return {
|
|
name: engine.name,
|
|
isDefault: engine.name === defaultEngine.name,
|
|
alias: engine.alias || undefined,
|
|
favIconUrl,
|
|
};
|
|
}));
|
|
},
|
|
|
|
async search(searchProperties) {
|
|
await searchInitialized;
|
|
let engine;
|
|
if (searchProperties.engine) {
|
|
engine = Services.search.getEngineByName(searchProperties.engine);
|
|
if (!engine) {
|
|
throw new ExtensionError(`${searchProperties.engine} was not found`);
|
|
}
|
|
} else {
|
|
engine = await Services.search.getDefault();
|
|
}
|
|
let submission = engine.getSubmission(searchProperties.query, null, "webextension");
|
|
let options = {
|
|
postData: submission.postData,
|
|
triggeringPrincipal: context.principal,
|
|
};
|
|
let tabbrowser;
|
|
if (searchProperties.tabId === null) {
|
|
let {gBrowser} = windowTracker.topWindow;
|
|
let nativeTab = gBrowser.addTab(submission.uri.spec, options);
|
|
if (!searchLoadInBackground) {
|
|
gBrowser.selectedTab = nativeTab;
|
|
}
|
|
tabbrowser = gBrowser;
|
|
} else {
|
|
let tab = tabTracker.getTab(searchProperties.tabId);
|
|
tab.linkedBrowser.loadURI(submission.uri.spec, options);
|
|
tabbrowser = tab.linkedBrowser.getTabBrowser();
|
|
}
|
|
BrowserUsageTelemetry.recordSearch(tabbrowser, engine, "webextension");
|
|
},
|
|
},
|
|
};
|
|
}
|
|
};
|