Issue 3170 - Fixed: Sitekey not considered for element collapsing

background.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 321 matching lines @@
       break;
     case "should-collapse":
       if (isFrameWhitelisted(sender.page, sender.frame, RegExpFilter.typeMap.DOCUMENT))
       {
         sendResponse(false);
         break;
       }
 
       var typeMask = RegExpFilter.typeMap[msg.mediatype];
       var documentHost = extractHostFromFrame(sender.frame);
+      var sitekey = getKey(sender.page, sender.frame);
       var blocked = false;
 
       for (var i = 0; i < msg.urls.length; i++)
       {
         var url = new URL(msg.urls[i], msg.baseURL);
         var filter = defaultMatcher.matchesAny(
           stringifyURL(url), typeMask,
-          documentHost, isThirdParty(url, documentHost),
-          getKey(sender.page, sender.frame)

[Sebastian Noack, 2015/10/08 04:45:04]

Mind getting the key above, outside of the loop?

Anyway, well spotted. But despite the key being missing here, I wonder why the
isFrameWhitelisted call above doesn't already return true skipping this code. So
if I didn't overlook something, this isn't the only bug here.

[Thomas Greiner, 2015/10/08 12:39:36]

Done.
That's because the filter `@@$sitekey=...` does not apply to the entire frame.
For that it would need to be written as `@@$document,sitekey=...`.

+          documentHost, isThirdParty(url, documentHost), sitekey
         );
 
         if (filter instanceof BlockingFilter)
         {
           if (filter.collapse != null)
           {
             sendResponse(filter.collapse);
             return;
           }
 
@@ skipping 67 matching lines @@
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });