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 36 matching lines @@
   }
 });
 
 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, "GENERICBLOCK");
   var filter = defaultMatcher.matchesAny(
     stringifyURL(url),
     type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(),
     docDomain,
     isThirdParty(url, docDomain),
-    key
+    key,
+    specificOnly

[Sebastian Noack, 2015/03/12 12:36:12]

I suppose this isn't the only call that needs to be adapted. What's about
popupBlocker.js?

[kzar, 2015/03/12 19:22:45]

Good point, I didn't consider popups! I updated my test page and it turns out my
Firefox changes work fine but these Chrome ones don't. Fixed that now.

Done.

   );
 
   // We can't listen to onHeadersReceived in Safari so we need to
   // check for notifications here
   if (platform != "chromium" && type == "sub_frame")
   {
     var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(url));
     if (notificationToShow)
       showNotification(notificationToShow);
   }
@@ skipping 27 matching lines @@
         processKey(header.value, page, frame);
     }
 
     var notificationToShow = NotificationStorage.getNextToShow(stringifyURL(new URL(details.url)));
     if (notificationToShow)
       showNotification(notificationToShow);
   }
 
   chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http://*/*", "https://*/*"]}, ["responseHeaders"]);
 }