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 519 matching lines @@
       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.

+      if (isFrameWhitelisted(tabId, frameId, "DOCUMENT"))
       {
         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)
@@ skipping 45 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);
 });