Issue 2064 - Configure indistinguishable request types in the abstraction layer

chrome/ext/background.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 313 matching lines @@
   ext.getFrame = function(tabId, frameId)
   {
     return (framesOfTabs[tabId] || {})[frameId];
   };
 
   ext.webRequest = {
     onBeforeRequest: new ext._EventTarget(),
     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged
   };
 
+  // Since Chrome 38 requests of type 'object' (e.g. requests
+  // initiated by Flash) are mistakenly reported with the type 'other'.
+  // https://code.google.com/p/chromium/issues/detail?id=410382
+  if (parseInt(navigator.userAgent.match(/\bChrome\/(\d+)/)[1], 10) >= 38)
+  {
+    ext.webRequest.indistinguishableTypes = [
+      ["OTHER", "OBJECT", "OBJECT_SUBREQUEST", "MEDIA", "FONT"]

[Wladimir Palant, 2015/03/02 19:12:18]

This will overshoot. With the previous approach, a filter with $media option
wouldn't apply to objects. Indeed, this filter wouldn't apply to anything due to
our hack - but that was ok given that there aren't so many rules applying to
audio/video but many for objects. Now this filter will apply to object
subrequests and even objects that have been correctly reports as such by Chrome.

[Sebastian Noack, 2015/03/02 19:23:11]

I felt that it's more correct this way. But fair enough. I restored the previous
behavior, ignoring MEDIA and FONT filters again.

+    ];
+  }
+  else
+  {
+    ext.webRequest.indistinguishableTypes = [
+      ["OBJECT", "OBJECT_SUBREQUEST"],
+      ["OTHER", "MEDIA", "FONT"]
+    ];
+  }
+
   chrome.tabs.query({}, function(tabs)
   {
     tabs.forEach(function(tab)
     {
       chrome.webNavigation.getAllFrames({tabId: tab.id}, function(details)
       {
         if (details && details.length > 0)
         {
           var frames = framesOfTabs[tab.id] = Object.create(null);
 
@@ skipping 53 matching lines @@
         else
         {
           frameId = details.frameId;
           requestType = details.type.toUpperCase();
         }
 
         frame = frames[frameId] || frames[Object.keys(frames)[0]];
 
         if (frame)
         {
-          // Since Chrome 38 requests of type 'object' (e.g. requests
-          // initiated by Flash) are mistakenly reported with the type 'other'.
-          // https://code.google.com/p/chromium/issues/detail?id=410382
-          if (requestType == "OTHER" && parseInt(navigator.userAgent.match(/\bChrome\/(\d+)/)[1], 10) >= 38)
-            requestType = "OBJECT";
-
           var results = ext.webRequest.onBeforeRequest._dispatch(
             url,
             requestType,
             new Page({id: details.tabId}),
             frame
           );
 
           if (results.indexOf(false) != -1)
             return {cancel: true};
         }
@@ skipping 97 matching lines @@
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
 })();