Issue 616 - Enforce $generichide and $genericblock in Chrome

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
@@ skipping 47 matching lines @@
     FilterNotifier.triggerListeners("filter.hitCount", filter, 0, 0, page);
 }
 
 function onBeforeRequest(url, type, page, frame)
 {
   if (isFrameWhitelisted(page, frame))
     return true;
 
   var docDomain = extractHostFromFrame(frame);
   var key = getKey(page, frame);
+  var specificOnly = isFrameWhitelisted(page, frame,
+                                        RegExpFilter.typeMap.GENERICBLOCK);
   var filter = defaultMatcher.matchesAny(
     stringifyURL(url),
     RegExpFilter.typeMap[type], docDomain,
     isThirdParty(url, docDomain),
-    key
+    key,
+    specificOnly
   );
 
   setTimeout(onBeforeRequestAsync, 0, url, type, page, filter);
 
   return !(filter instanceof BlockingFilter);
 }
 
 ext.webRequest.onBeforeRequest.addListener(onBeforeRequest);
 
 if (platform == "chromium")
@@ skipping 18 matching lines @@
 
   chrome.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }