Issue 433 - Made adjustments for $sitekey-related changes to the Matcher API

webrequest.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 @@
     onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000);
   }
 });
 
 function onBeforeRequest(url, type, page, frame)
 {
   if (isFrameWhitelisted(page, frame))
     return true;
 
   var docDomain = extractHostFromFrame(frame);
+  var key = getKey(page, frame);
   var filter = defaultMatcher.matchesAny(
     url,
     type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
     docDomain,
-    isThirdParty(extractHostFromURL(url), docDomain)
+    isThirdParty(extractHostFromURL(url), docDomain),
+    key
   );
 
   // We can't listen to onHeadersReceived in Safari so we need to
   // check for notifications here
   if (platform != "chromium" && type == "sub_frame")
   {
     var notificationToShow = Notification.getNextToShow(url);
     if (notificationToShow)
       showNotification(notificationToShow);
   }
@@ skipping 17 matching lines @@
     var page = new ext.Page({id: details.tabId});
     var frame = ext.getFrame(details.tabId, details.frameId);
 
     if (!frame || frame.url != details.url)
       return;
 
     for (var i = 0; i < details.responseHeaders.length; i++)
     {
       var header = details.responseHeaders[i];
       if (header.name.toLowerCase() == "x-adblock-key" && header.value)
-        processKeyException(header.value, page, frame);
+        processKey(header.value, page, frame);
     }
 
     var notificationToShow = Notification.getNextToShow(details.url);
     if (notificationToShow)
       showNotification(notificationToShow);
   }
 
   chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http://*/*", "https://*/*"]}, ["responseHeaders"]);
 }