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

include.postload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 175 matching lines @@
 
     case "video":
     case "audio":
     case "picture":
       return getURLsFromMediaElement(element);
   }
 
   return getURLsFromAttributes(element);
 }
 
-function isBlockable(element)
-{
-  if (element.id)
-    return true;
-  if (element.classList.length > 0)
-    return true;
-  if (getURLsFromElement(element).length > 0)
-    return true;
-
-  // We only generate filters based on the "style" attribute,
-  // if this is the only way we can generate a filter, and
-  // only if there are at least two CSS properties defined.
-  if (/:.+:/.test(element.getAttribute("style")))
-    return true;
-
-  return false;
-}
-
 // Gets the absolute position of an element by walking up the DOM tree,
 // adding up offsets.
 // I hope there's a better way because it just seems absolutely stupid
 // that the DOM wouldn't have a direct way to get this, given that it
 // has hundreds and hundreds of other methods that do random junk.
 function getAbsolutePosition(elt) {
   var l = 0;
   var t = 0;
   for(; elt; elt = elt.offsetParent) {
     l += elt.offsetLeft;
@@ skipping 90 matching lines @@
 // Turn on the choose element to create filter thing
 function clickHide_activate() {
   if(document == null)
     return;
 
   // If we are already selecting, abort now
   if (clickHide_activated || clickHideFiltersDialog)
     clickHide_deactivate();
 
   // Add overlays for blockable elements that don't emit mouse events that they can still be selected
-  var elts = document.querySelectorAll('object,embed,iframe');
-  for(var i=0; i<elts.length; i++)
-  {
-    var element = elts[i];
-    if (isBlockable(element))
-      addElementOverlay(element);
-  }
+  [].forEach.call(
+    document.querySelectorAll('object,embed,iframe'),
+    function(element)
+    {
+      getFiltersForElement(element, function(filters)
+      {
+        if (filters.length > 0)
+          addElementOverlay(element);
+      });
+    }
+  );
 
   clickHide_activated = true;
   document.addEventListener("mouseover", clickHide_mouseOver, true);
   document.addEventListener("mouseout", clickHide_mouseOut, true);
   document.addEventListener("click", clickHide_mouseClick, true);
   document.addEventListener("keydown", clickHide_keyDown, true);
 }
 
 // Called when user has clicked on something and we are waiting for confirmation
 // on whether the user actually wants these filters
@@ skipping 40 matching lines @@
       overlays[0].parentNode.removeChild(overlays[0]);
   }
 }
 
 function clickHide_elementClickHandler(ev) {
   ev.preventDefault();
   ev.stopPropagation();
   clickHide_mouseClick(ev);
 }
 
+function getBlockableElementOrAncestor(element, callback)
+{
+  if (element && element != document.documentElement &&
+                 element != document.body)
+  {
+    if (element instanceof HTMLElement)
+    {
+      getFiltersForElement(element, function(filters)
+      {
+        if (filters.length > 0)
+          callback(element);
+        else
+          getBlockableElementOrAncestor(element.parentElement, callback);
+      });
+    }
+    else
+    {
+      getBlockableElementOrAncestor(element.parentElement, callback);
+    }
+  }
+  else
+  {
+    callback(null);
+  }
+}
+
 // Hovering over an element so highlight it
 function clickHide_mouseOver(e)
 {
   if (clickHide_activated == false)
     return;
 
-  var target = e.target;
-  while (target.parentNode && !isBlockable(target))
-    target = target.parentNode;
-  if (target == document.documentElement || target == document.body)
-    target = null;
+  getBlockableElementOrAncestor(e.target, function(element)
+  {
+    if (currentElement)
+      unhighlightElement(currentElement);
 
-  if (target && target instanceof HTMLElement)
-  {
-    currentElement = target;
+    if (element)
+    {
+      highlightElement(element, "#d6d84b", "#f8fa47");
+      element.addEventListener("contextmenu", clickHide_elementClickHandler, true);
+    }
 
-    highlightElement(target, "#d6d84b", "#f8fa47");
-    target.addEventListener("contextmenu", clickHide_elementClickHandler, true);
-  }
+    currentElement = element;
+  });
 }
 
 // No longer hovering over this element so unhighlight it
 function clickHide_mouseOut(e)
 {
-  if (!clickHide_activated || !currentElement)
+  if (!clickHide_activated || currentElement != e.target)
     return;
 
   unhighlightElement(currentElement);
   currentElement.removeEventListener("contextmenu", clickHide_elementClickHandler, true);
 }
 
 // Selects the currently hovered-over filter or cancels selection
 function clickHide_keyDown(e)
 {
   if (!e.ctrlKey && !e.altKey && !e.shiftKey && e.keyCode == 13 /*DOM_VK_RETURN*/)
@@ skipping 17 matching lines @@
 {
   ext.backgroundPage.sendMessage(
     {
       type: "compose-filters",
       tagName: element.localName,
       id: element.id,
       src: element.getAttribute("src"),
       style: element.getAttribute("style"),
       classes: [].slice.call(element.classList),
       urls: getURLsFromElement(element),
+      mediatype: typeMap[element.localName],
       baseURL: document.location.href
     },
     function(response)
     {
       callback(response.filters, response.selectors);
     }
   );
 }
 
 // When the user clicks, the currentElement is the one we want.
@@ skipping 208 matching lines @@
           lastRightClickEventValid = false;
         else
           lastRightClickEvent = null;
         break;
     }
   });
 
   if (window == window.top)
     ext.backgroundPage.sendMessage({type: "report-html-page"});
 }