Topic 11337 - More reliable approach to hide image/frame placeholders

background.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 449 matching lines @@
             chrome.tabs.onUpdated.removeListener(listener);
             onLoad();
           }
         };
         chrome.tabs.onUpdated.addListener(listener);
       }
     });
   }
 }
 
+/**
+ * This function is a hack - we only know the tabId and document URL for a
+ * message but we need to know the frame ID. Try to find it in webRequest's
+ * frame data.
+ */
+function getFrameId(tabId, url)
+{
+  if (tabId in frames)
+  {
+    for (var f in frames[tabId])
+    {
+      if (getFrameUrl(tabId, f) == url)
+        return f;
+    }
+  }
+  return -1;
+}
+
 chrome.extension.onRequest.addListener(function(request, sender, sendResponse)
 {
   switch (request.reqtype)
   {
     case "get-settings":
       var hostDomain = null;
       var selectors = null;
 
-      // HACK: We don't know which frame sent us the message, try to find it
-      // in webRequest's frame data.
       var tabId = -1;
       var frameId = -1;
       if (sender.tab)
       {
         tabId = sender.tab.id;
-        if (tabId in frames)
-        {
-          for (var f in frames[tabId])
-          {
-            if (getFrameUrl(tabId, f) == request.frameUrl)
-            {
-              frameId = f;
-              break;
-            }
-          }
-        }
+        frameId = getFrameId(tabId, request.frameUrl);
       }
 
       var enabled = !isFrameWhitelisted(tabId, frameId, "DOCUMENT") && !isFrameWhitelisted(tabId, frameId, "ELEMHIDE");
       if (enabled && request.selectors)
       {
         var noStyleRules = false;
         var host = extractHostFromURL(request.frameUrl);
         hostDomain = getBaseDomain(host);
         for (var i = 0; i < noStyleRulesHosts.length; i++)
         {
           var noStyleHost = noStyleRulesHosts[i];
           if (host == noStyleHost || (host.length > noStyleHost.length &&
                                       host.substr(host.length - noStyleHost.length - 1) == "." + noStyleHost))
           {
             noStyleRules = true;
           }
         }
         selectors = ElemHide.getSelectorsForDomain(host, false);
         if (noStyleRules)
         {
           selectors = selectors.filter(function(s)
           {
             return !/\[style[\^\$]?=/.test(s);
           });
         }
       }
 
       sendResponse({enabled: enabled, hostDomain: hostDomain, selectors: selectors});
       break;
+    case "should-collapse":
+      var tabId = -1;
+      var frameId = -1;
+      if (sender.tab)
+      {
+        tabId = sender.tab.id;
+        frameId = getFrameId(tabId, request.documentUrl);
+      }
+
+      var enabled = !isFrameWhitelisted(tabId, frameId, "DOCUMENT");
+      if (!enabled)

[Thomas Greiner, 2012/10/31 11:32:00]

very confusing

why not simply like that:
if (isFrameWhitelisted(...))
or
var whitelisted = isFrameWhitelisted(...);
if (whitelisted)

[Wladimir Palant, 2012/10/31 12:17:53]

That's code copied from element hiding handling above but sure - I can change
it.

+      {
+        sendResponse(false);
+        break;
+      }
+
+      var requestHost = extractHostFromURL(request.url);
+      var documentHost = extractHostFromURL(request.documentUrl);
+      var thirdParty = isThirdParty(requestHost, documentHost);
+      var filter = defaultMatcher.matchesAny(request.url, request.type, documentHost, thirdParty);
+      if (filter instanceof BlockingFilter)
+      {
+        var collapse = filter.collapse;
+        if (collapse == null)
+          collapse = (localStorage.hidePlaceholders != "false");
+        sendResponse(collapse);
+      }
+      else
+        sendResponse(false);
+      break;
     case "get-domain-enabled-state":
       // Returns whether this domain is in the exclusion list.
       // The page action popup asks us this.
       if(sender.tab)
       {
         sendResponse({enabled: !isWhitelisted(sender.tab.url), specialCaseYouTube: localStorage["specialCaseYouTube"] == "true", disableInlineTextAds: localStorage["disableInlineTextAds"] == "true"});
         return;
       }
       break;
     case "add-filters":
@@ skipping 26 matching lines @@
       refreshIconAndContextMenu(windows[i].tabs[j]);
 });
 
 // Update icon if a tab changes location
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
 {
   chrome.tabs.sendRequest(tabId, {reqtype: "clickhide-deactivate"})
   if(changeInfo.status == "loading")
     refreshIconAndContextMenu(tab);
 });