Issue 1739 - Respect MessageSender.frameId if available

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 340 matching lines @@
       page: new Page(rawSender.tab),
       frame: {
         url: rawSender.url,
         get parent()
         {
           var frames = framesOfTabs[rawSender.tab.id];
 
           if (!frames)
             return null;
 
-          for (var frameId in frames)
+          if ("frameId" in rawSender)
           {
-            if (frames[frameId].url == rawSender.url)
-              return frames[frameId].parent;
+            // Chrome 41+
+            var frame = frames[rawSender.frameId];
+            if (frame)
+              return frame.parent;
+          }
+          else

[kzar, 2015/01/05 15:30:15]

Maybe remove the else here? That way if rawSender.frameId exists but
frames[rawSender.frameId] doesn't we could still use the old approach?

[Sebastian Noack, 2015/01/05 15:33:36]

I think falling back to the top-level frame in this case is fine. Note, that
whatever frame we would find (if any) with the old approach would be the wrong
frame anyway, if we don't know the actual frame.

+          {
+            // Chrome 28-40
+            for (var frameId in frames)
+            {
+              if (frames[frameId].url == rawSender.url)
+                return frames[frameId].parent;
+            }
           }
 
           return frames[0];
         }
       }
     };
 
     return ext.onMessage._dispatch(message, sender, sendResponse);
   });
 
@@ skipping 31 matching lines @@
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
 })();