Noissue - Adapt check for devtools panel support for Firefox

messageResponder.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 24 matching lines @@
   const {Filter, BlockingFilter, RegExpFilter} = require("filterClasses");
   const {Synchronizer} = require("synchronizer");
 
   const info = require("info");
   const {
     Subscription,
     DownloadableSubscription,
     SpecialSubscription
   } = require("subscriptionClasses");
 
-  // Some modules doesn't exist on Firefox. Moreover,
-  // require() throws an exception on Firefox in that case.
-  // However, try/catch causes the whole function to to be
-  // deoptimized on V8. So we wrap it into another function.
-  function tryRequire(module)
-  {
-    try
-    {
-      return require(module);
-    }
-    catch (e)
-    {
-      return null;
-    }
-  }
+  port.on("types.get", (message, sender) =>
+  {
+    let filterTypes = Array.from(require("requestBlocker").filterTypes);
+    filterTypes.push(...filterTypes.splice(filterTypes.indexOf("OTHER"), 1));
+    return filterTypes;
+  });
 
   function convertObject(keys, obj)
   {
     let result = {};
     for (let key of keys)
     {
       if (key in obj)
         result[key] = obj[key];
     }
     return result;
@@ skipping 82 matching lines @@
       listenerFilters = Object.create(null);
       changeListeners.set(page, listenerFilters);
     }
     return listenerFilters;
   }
 
   port.on("app.get", (message, sender) =>
   {
     if (message.what == "issues")
     {
-      let subscriptionInit = tryRequire("subscriptionInit");
+      let subscriptionInit = require("subscriptionInit");
       let result = subscriptionInit ? subscriptionInit.reinitialized : false;
       return {filterlistsReinitialized: result};
     }
 
     if (message.what == "doclink")
       return Utils.getDocLink(message.link);
 
     if (message.what == "localeInfo")
     {
       let bidiDir;
       if ("chromeRegistry" in Utils)
       {
         let isRtl = Utils.chromeRegistry.isLocaleRTL("adblockplus");
         bidiDir = isRtl ? "rtl" : "ltr";
       }
       else
         bidiDir = Utils.readingDirection;
 
       return {locale: Utils.appLocale, bidiDir};
     }
 
     if (message.what == "features")
     {
       return {
         devToolsPanel: info.platform == "chromium" ||
                        info.application == "firefox" &&

[Sebastian Noack, 2017/09/14 23:30:49]

I explicitly check for `application == "firefox" here, and not for `platform ==
"gecko"`, since the devtools panel API is not supported on Firefox Mobile.

[Manish Jethani, 2017/09/15 11:37:14]

Acknowledged.

[Manish Jethani, 2017/09/15 11:37:14]

We'll have to use parseInt here since the application version can be something
like "54.0.1", which becomes NaN when converted to a number simply.

I would also use parentheses around the two checks to group them for clarity,
but it's your call.

[Thomas Greiner, 2017/09/15 12:20:04]

Well spotted. Note that we usually use `Services.vc.compare()` to compare
version strings.

[Sebastian Noack, 2017/09/15 16:51:47]

Done.

-                       info.applicationVersion >= 54
+                       parseInt(info.applicationVersion, 10) >= 54
       };
     }
 
     return info[message.what];
   });
 
   port.on("app.listen", (message, sender) =>
   {
     getListenerFilters(sender.page).app = message.filter;
   });
@@ skipping 236 matching lines @@
     if (message.url)
       subscriptions = [Subscription.fromURL(message.url)];
 
     for (let subscription of subscriptions)
     {
       if (subscription instanceof DownloadableSubscription)
         Synchronizer.execute(subscription, true);
     }
   });
 })(this);