Make sure to collapse <frame> tags as well

include.preload.js

 /*
  * This file is part of the Adblock Plus extension,
  * Copyright (C) 2006-2012 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 44 matching lines @@
     }
   }
   setRules();
 }
 
 var typeMap = {
   "img": "IMAGE",
   "input": "IMAGE",
   "audio": "MEDIA",
   "video": "MEDIA",
+  "frame": "SUBDOCUMENT",
   "iframe": "SUBDOCUMENT"
 };
 
 function checkCollapse(event)
 {
   var target = event.target;
   var tag = target.localName;
-  if (tag in typeMap && event.type == (tag == "iframe" ? "load" : "error"))
+  var expectedEvent = (tag == "iframe" || tag == "frame" ? "load" : "error");
+  if (tag in typeMap && event.type == expectedEvent)
   {
     // This element failed loading, did we block it?
     var url = target.src;
     if (!url)
       return;
 
     var type = typeMap[tag];
     chrome.extension.sendRequest({reqtype: "should-collapse", url: url, documentUrl: document.URL, type: type}, function(response)
     {
       if (response && target.parentNode)
-        target.parentNode.removeChild(target);
+      {
+        // <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);
 
   chrome.extension.sendRequest({reqtype: "get-settings", selectors: true, frameUrl: window.location.href}, function(response)
   {
     setElemhideCSSRules(response.selectors);
   });
 }
 
 // In Chrome 18 the document might not be initialized yet
 if (document.documentElement)
   init();
 else
   window.setTimeout(init, 0);