Issue 1282 - Don't generate filters conflicting with existing exception rules

include.preload.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var SELECTOR_GROUP_SIZE = 20;
 
 var typeMap = {
   "img": "IMAGE",
   "input": "IMAGE",
+  "picture": "IMAGE",

[kzar, 2014/12/15 15:45:40]

Are these changes relevant to the issue?

[Sebastian Noack, 2014/12/15 15:58:42]

Yes, they are. Initially this mapping were only used by the element collapsing
code, which isn't used for <obect> and <embed> elements. However, the new code
stripping whitelisted filters, using this mapping as well, also considers those
elements.

The <picture> element is relevant for both use cases, and were just missing,
since this element is rather new.

   "audio": "MEDIA",
   "video": "MEDIA",
   "frame": "SUBDOCUMENT",
-  "iframe": "SUBDOCUMENT"
+  "iframe": "SUBDOCUMENT",
+  "object": "OBJECT",
+  "embed": "OBJECT"
 };
 
 function checkCollapse(element)
 {
   var tag = element.localName;
   if (tag in typeMap)
   {
     // This element failed loading, did we block it?
     var url = element.src;
     if (!url || !/^https?:/i.test(url))
@@ skipping 206 matching lines @@
   }, true);
 
   ext.backgroundPage.sendMessage({type: "get-selectors"}, setElemhideCSSRules);
 }
 
 if (document instanceof HTMLDocument)
 {
   checkSitekey();
   init(document);
 }