Issue 4579 - Wrap runtime.onMessage

polyfill.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 41 matching lines @@
     // Older versions of Chrome have a typo:
     // https://crrev.com/c33f51726eacdcc1a487b21a13611f7eab580d6d
     /^The message port closed before a res?ponse was received\.$/;
 
   // This is the error Firefox throws when a message listener is not a
   // function.
   const invalidMessageListenerError = "Invalid listener for runtime.onMessage.";
 
   let messageListeners = new WeakMap();
 
-  function wrapAPI(api)
+  function wrapAsyncAPI(api)
   {
     let object = browser;
     let path = api.split(".");
     let name = path.pop();
 
     for (let node of path)
     {
       object = object[node];
 
       if (!object)
@@ skipping 47 matching lines @@
           {
             resolve(result);
           }
         });
       });
     };
 
     Object.defineProperty(object, name, descriptor);
   }
 
-  function wrapMessageAPIs()
+  function wrapRuntimeOnMessage()
   {
     let {onMessage} = browser.runtime;
     let {addListener, removeListener, hasListener} = onMessage;
 
     onMessage.addListener = function(listener)
     {
       if (typeof listener != "function")
         throw new Error(invalidMessageListenerError);
 
       // Don't add the same listener twice or we end up with multiple wrappers.
@@ skipping 65 matching lines @@
 
   if (shouldWrapAPIs())
   {
     // Unlike Firefox and Microsoft Edge, Chrome doesn't have a "browser"
     // object, but provides the extension API through the "chrome" namespace
     // (non-standard).
     if (typeof browser == "undefined")
       window.browser = chrome;
 
     for (let api of asyncAPIs)
-      wrapAPI(api);
-
-    wrapMessageAPIs();
+      wrapAsyncAPI(api);
+
+    wrapRuntimeOnMessage();
   }
 
   // Workaround since HTMLCollection, NodeList, StyleSheetList, and CSSRuleList
   // didn't have iterator support before Chrome 51.
   // https://bugs.chromium.org/p/chromium/issues/detail?id=401699
   for (let object of [HTMLCollection, NodeList, StyleSheetList, CSSRuleList])
   {
     if (!(Symbol.iterator in object.prototype))
       object.prototype[Symbol.iterator] = Array.prototype[Symbol.iterator];
   }
 }