Issue 3823 - Split up message responder code

background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 22 matching lines @@
   this.extractHostFromFrame = extractHostFromFrame;
 }
 var FilterStorage = require("filterStorage").FilterStorage;
 var FilterNotifier = require("filterNotifier").FilterNotifier;
 var SpecialSubscription = require("subscriptionClasses").SpecialSubscription;
 var ElemHide = require("elemHide").ElemHide;
 var defaultMatcher = require("matcher").defaultMatcher;
 var Prefs = require("prefs").Prefs;
 var updateIcon = require("icon").updateIcon;
 var showNextNotificationForUrl = require("notificationHelper").showNextNotificationForUrl;
 var port = require("messaging").port;

[Wladimir Palant, 2016/03/21 15:50:12]

Arguably, this should use getPort() as well and no default port exposed - if you
expose a default port people will use it by accident and listeners will stay
around.

[Sebastian Noack, 2016/03/21 17:15:42]

background.js is matter to go away. In the mid-term all code will be
encapsulated in modules. This patch is just the first step. And I'd rather avoid
unnecessary boilerplate to get the port in each module, as well as logic to
cache the port which wouldn't be necessary otherwise.

I consider getPort() a temporarily hack, that is matter to be removed once we
use asynchronous messaging properly in the popup. And except for that edge case,
all messaging code using the port API runs in the background page (hence in the
same thread and for the same window) anyway, where we don't have to disconnect
the port.

 var devtools = require("devtools");
 
 // Special-case domains for which we cannot use style-based hiding rules.
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
 var htmlPages = new ext.PageMap();
 
 var contextMenuItem = {
   title: ext.i18n.getMessage("block_element"),
@@ skipping 129 matching lines @@
       if (filter.collapse != null)
         return filter.collapse;
 
       blocked = true;
     }
   }
 
   return blocked && Prefs.hidePlaceholders;
 });
 
-port.on("get-domain-enabled-state", function(msg, sender)
-{
-  return {enabled: !checkWhitelisted(sender.page)};
-});
-
 port.on("forward", function(msg, sender)
 {
   var targetPage;
   if (msg.targetPageId)
     targetPage = ext.getPage(msg.targetPageId);
   else
     targetPage = sender.page;
 
   if (targetPage)
   {
     msg.payload.sender = sender.page.id;
     if (msg.expectsResponse)
       return new Promise(targetPage.sendMessage.bind(targetPage, msg.payload));
     targetPage.sendMessage(msg.payload);
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "composer.content.finished"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });