Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari

include.preload.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 64 matching lines @@
   {
     // This element failed loading, did we block it?
     var url = target.src;
     if (!url)
       return;
 
     ext.backgroundPage.sendMessage(
       {
         type: "should-collapse",
         url: url,
-        documentUrl: document.URL,
         mediatype: typeMap[tag]
       },
 
       function(response)
       {
         if (response && target.parentNode)
         {
           // <frame> cannot be removed, doing that will mess up the frameset
           if (tag == "frame")
             target.style.setProperty("visibility", "hidden", "!important");
           else
             target.parentNode.removeChild(target);
         }
       }
     );
   }
 }
 
 function init()
 {
   // Make sure this is really an HTML page, as Chrome runs these scripts on just about everything
   if (!(document.documentElement instanceof HTMLElement))
     return;
 
   document.addEventListener("error", checkCollapse, true);
   document.addEventListener("load", checkCollapse, true);
 
-  ext.backgroundPage.sendMessage(
-    {
-      type: "get-selectors",
-      frameUrl: window.location.href
-    },
-    setElemhideCSSRules
-  );
+  var attr = document.documentElement.getAttribute("data-adblockkey");
+  if (attr)
+    ext.backgroundPage.sendMessage({type: "add-key-exception", token: attr});
+
+  ext.backgroundPage.sendMessage({type: "get-selectors"}, setElemhideCSSRules);
 }
 
 // In Chrome 18 the document might not be initialized yet
 if (document.documentElement)
   init();
 else
   window.setTimeout(init, 0);