Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 11:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 51b417f1d2c3 (bug 1437258) for ESlint failure on ext-webRequest.js. CLOSED TREE

Browse Source
This commit is contained in:
Brindusan Cristian 2018-12-01 01:45:25 +02:00
parent ee1ecb8b3e
commit 72d1f0567b
3 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/components/extensions/ExtensionChild.jsm
View File

@ -46,7 +46,6 @@ ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
const {
DefaultMap,
ExtensionError,
LimitedSet,
getMessageManager,
getUniqueId,
@ -934,7 +933,6 @@ class ChildAPIManager {
MessageChannel.addListener(messageManager, "API:RunListener", this);
messageManager.addMessageListener("API:CallResult", this);
messageManager.addMessageListener("API:AddListenerResult", this);
this.messageFilterStrict = {childId: this.id};
@ -1017,15 +1015,6 @@ class ChildAPIManager {
}
this.callPromises.delete(data.callId);
break;
case "API:AddListenerResult":
if ("error" in data) {
let listenerMap = this.listeners.get(data.path);
listenerMap.ids.delete(data.listenerId);
Promise.reject(new ExtensionError(data.error.message));
}
break;
}
}
@ -1097,7 +1086,6 @@ class ChildAPIManager {
close() {
this.messageManager.sendAsyncMessage("API:CloseProxyContext", {childId: this.id});
this.messageManager.removeMessageListener("API:CallResult", this);
this.messageManager.removeMessageListener("API:AddListenerResult", this);
MessageChannel.removeListener(this.messageManager, "API:RunListener", this);
if (this.updatePermissions) {

24
toolkit/components/extensions/ExtensionParent.jsm
View File

@ -981,23 +981,6 @@ ParentAPIManager = {
let handlingUserInput = false;
let lowPriority = data.path.startsWith("webRequest.");
let reply = result => {
if (!context.parentMessageManager) {
Services.console.logStringMessage("Cannot send function call " +
"result: other side closed connection " +
`(call data: ${uneval({path: data.path, args: data.args})})`);
return;
}
context.parentMessageManager.sendAsyncMessage(
"API:AddListenerResult",
Object.assign({
childId: data.childId,
listenerId: data.listenerId,
path: data.path,
}, result));
};
function listener(...listenerArgs) {
return context.sendMessage(
context.parentMessageManager,
@ -1038,14 +1021,7 @@ ParentAPIManager = {
if (handler.setUserInput) {
handlingUserInput = true;
}
try {
handler.addListener(listener, ...args);
} catch (e) {
context.listenerProxies.delete(data.listenerId);
const error = context.normalizeError(e);
reply({error: {message: error.message}});
}
},
async removeListener(data) {

4
toolkit/components/extensions/parent/ext-webRequest.js
View File

@ -62,8 +62,8 @@ function registerEvent(extension, eventName, fire, filter, info, tabParent = nul
if (info) {
for (let desc of info) {
if (desc == "blocking" && !blockingAllowed) {
throw new ExtensionError("Using webRequest.addListener with the " +
"blocking option requires the 'webRequestBlocking' permission.");
Cu.reportError("Using webRequest.addListener with the blocking option " +
"requires the 'webRequestBlocking' permission.");
} else {
info2.push(desc);
}