Issue 6774 - $document doesn't whitelist everything inside iframes in Edge

ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 547 matching lines @@
 
           if (!frames)
             return null;
 
           let frame;
           // In Microsoft Edge (version 42.17134.1.0) we don't have frameId
           // so we fall back to iterating over the tab's frames
           // see https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/11716733
           if (rawSender.frameId != undefined)
             frame = frames.get(rawSender.frameId);
-          else
+          else if (rawSender.url)
           {
-            for (let [key, value] of frames)

[kzar, 2018/07/17 16:54:35]

Nit: Would be nice to use some more descriptive variable names, e.g. something
like `frameId` and `frame`. Oh, `frame` is already taken actually, but you get
the idea.

[geo, 2018/07/18 16:08:11]

Done.

+            let rawSenderHref = rawSender.url.replace(/#.*/, "");
+
+            for (let [frameId, frameInfo] of frames)
             {
-              let valueHref = value.url.href.replace(/#.*/, "");

[kzar, 2018/07/17 16:54:35]

Nit: I'd consider using `String.prototype.substring` to take the part of
`value.url.href` up to the first "#", instead of using
`String.prototype.replace` with a regular expression to mutate `value.url.href`.
I'm not sure that it matters in practice though.

[geo, 2018/07/18 16:08:10]

I'm not sure either, but for `String.prototype.substring` or
`String.prototype.substr` I would need to use `String.prototype.indexOf` and
that returns `-1` if no hash is found, so I need an extra check. That's why I
went with replace.

-
-              let rawSenderHref = rawSender.url ?

[kzar, 2018/07/17 16:54:35]

Can't we do this outside of the for loop?

[geo, 2018/07/18 16:08:10]

Done.

-                rawSender.url.replace(/#.*/, "") :
-                "";
-
-              // if we have two frames with the same URL

[kzar, 2018/07/17 16:54:35]

Nit: This is a good comment, but would you mind capitalising and adding a full
stop?

[geo, 2018/07/18 16:08:10]

Done.

+              let frameInfoHref = frameInfo.url.href.replace(/#.*/, "");
+
+              // If we have two frames with the same URL
               // we are going to pick the first one we find
-              // as we have no other way of distinguishing between them
-              if (valueHref == rawSenderHref)
+              // as we have no other way of distinguishing between them.
+              if (frameInfoHref == rawSenderHref)
               {
-                frame = value;
-                this.id = key;
+                frame = frameInfo;
+                this.id = frameId;
                 break;
               }
             }
           }
 
           if (frame)
             return frame.parent || null;
           return frames.get(0) || null;
         }
       };
     }
 
     return ext.onMessage._dispatch(
       message, sender, sendResponse
     ).includes(true);
   });
 }