Issue 3334 - Fix warnings spotted during testing before release

webrequest.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var FilterNotifier = require("filterNotifier").FilterNotifier;
 var RegExpFilter = require("filterClasses").RegExpFilter;
 var platform = require("info").platform;
+var whitelisting = require("whitelisting");
+var defaultMatcher = require("matcher").defaultMatcher;
+var url = require("url");
+var stringifyURL = url.stringifyURL;
+var isThirdParty = url.isThirdParty;
+var extractHostFromFrame = url.extractHostFromFrame;

[Wladimir Palant, 2015/11/17 18:58:42]

I don't think that changes to this file are a good idea a week before a release.
As I explained in the issue, all these variables are declared and defined, in
background.js. Structuring the imports in a better way might be a good thing to
do but unless you have an actual issue that needs to be fixed - after the
release please.

[kzar, 2015/11/17 19:06:26]

Done.

 
 ext.webRequest.indistinguishableTypes.forEach(function(types)
 {
   for (var i = 1; i < types.length; i++)
     RegExpFilter.typeMap[types[i]] = RegExpFilter.typeMap[types[0]];
 });
 
 FilterNotifier.addListener(function(action, arg)
 {
   switch (action)
@@ skipping 16 matching lines @@
 });
 
 function onBeforeRequestAsync(url, type, page, filter)
 {
   if (filter)
     FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
 }
 
 function onBeforeRequest(url, type, page, frame)
 {
-  if (isFrameWhitelisted(page, frame))
+  if (whitelisting.isFrameWhitelisted(page, frame))
     return true;
 
   var docDomain = extractHostFromFrame(frame);
-  var key = getKey(page, frame);
-  var specificOnly = isFrameWhitelisted(page, frame,
-                                        RegExpFilter.typeMap.GENERICBLOCK);
+  var key = whitelisting.getKey(page, frame);
+  var specificOnly = whitelisting.isFrameWhitelisted(
+    page, frame, RegExpFilter.typeMap.GENERICBLOCK
+  );
   var filter = defaultMatcher.matchesAny(
     stringifyURL(url),
     RegExpFilter.typeMap[type], docDomain,
     isThirdParty(url, docDomain),
     key,
     specificOnly
   );
 
   setTimeout(onBeforeRequestAsync, 0, url, type, page, filter);
 
@@ skipping 22 matching lines @@
 
   chrome.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }