Issue 4210 - Fix dynamic-frame collapsing in Chrome

lib/requestBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 61 matching lines @@
   setTimeout(onBeforeRequestAsync, 0, page, urlString,
                                       type, docDomain,
                                       thirdParty, sitekey,
                                       specificOnly, filter);
 
   return !(filter instanceof BlockingFilter);
 });
 
 port.on("filters.collapse", (message, sender) =>
 {
-  if (checkWhitelisted(sender.page, sender.frame))
+  var sender_frame = sender.frame;
+  if (message.dynamicFrameURL)
+  {
+    sender_frame = {
+      url: new URL(message.dynamicFrameURL,  message.baseURL),
+      parent: sender.frame
+    };
+  }
+
+  if (checkWhitelisted(sender.page, sender_frame))
     return false;
 
   let typeMask = RegExpFilter.typeMap[message.mediatype];
-  let documentHost = extractHostFromFrame(sender.frame);
-  let sitekey = getKey(sender.page, sender.frame);
+  let documentHost = extractHostFromFrame(sender_frame);
+  let sitekey = getKey(sender.page, sender_frame);
   let blocked = false;
 
   let specificOnly = checkWhitelisted(
-    sender.page, sender.frame,
+    sender.page, sender_frame,
     RegExpFilter.typeMap.GENERICBLOCK
   );
 
   for (let url of message.urls)
   {
     let urlObj = new URL(url, message.baseURL);
     let filter = defaultMatcher.matchesAny(
       stringifyURL(urlObj),
       typeMask, documentHost,
       isThirdParty(urlObj, documentHost),
@@ skipping 45 matching lines @@
 }
 
 FilterNotifier.on("subscription.added", onFilterChange)
 FilterNotifier.on("subscription.removed", onFilterChange);
 FilterNotifier.on("subscription.updated", onFilterChange);
 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("filter.added", onFilterChange);
 FilterNotifier.on("filter.removed", onFilterChange);
 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("load", onFilterChange);