Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 35 matching lines @@
 
   return false;
 };
 
 let verifyKeyException = function(token, url, docDomain)
 {
   let match = token.match(/((.*?)=*)_(.*)/);
   if (!match)
     return false;  // invalid format
 
-  if (!defaultMatcher.matchesByKey(url, match[2], docDomain))

[Felix Dahlke, 2014/01/18 13:39:19]

I think this would be easier to follow if you'd assign the matches to
temporaries. match[2] as "key" etc.

[Sebastian Noack, 2014/01/19 10:19:40]

Done.

+  let strippedKey = match[2];
+  if (!defaultMatcher.matchesByKey(url, strippedKey, docDomain))
     return false;  // unknown key
 
   let uri = new URI(url);
   let params = [
     uri.path,                                               // REQUEST_URI
     uri.asciiHost + (uri.port != -1 ? ":" + uri.port : ""), // HTTP_HOST
     window.navigator.userAgent                              // HTTP_USER_AGENT
   ];
 
-  return verifySignature(match[1], match[3], params.join("\0"));
+  let key = match[1];
+  let signature = match[3];
+  return verifySignature(key, signature, params.join("\0"));
 };
 
 let recordKeyException = function(tab, url)
 {
   let urlsWithKeyException = tabsWithKeyException.get(tab);
 
   if (!urlsWithKeyException)
   {
     urlsWithKeyException = {__proto__: null};
     tabsWithKeyException.set(tab, urlsWithKeyException);
   }
 
   urlsWithKeyException[url] = null;
 };
 
 let processKeyException = exports.processKeyException = function(token, tab, frame)
 {
   let url = stripFragmentFromURL(frame.url);
   let docDomain = extractHostFromURL((frame.parent || frame).url);
 
   if (verifyKeyException(token, url, docDomain))
     recordKeyException(tab, url);
 };