Issue 2063 - Make ext.webRequest use ABP instead Chrome request types

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 348 matching lines @@
   chrome.webRequest.onBeforeRequest.addListener(function(details)
   {
     try
     {
       // the high-level code isn't interested in requests that aren't related
       // to a tab and since those can only be handled in Chrome, we ignore
       // them here instead of in the browser independent high-level code.
       if (details.tabId == -1)
         return;
 
-      var requestType = details.type;
-      var isMainFrame = requestType == "main_frame" || (
+      var isMainFrame = details.type == "main_frame" || (
 
         // assume that the first request belongs to the top frame. Chrome
         // may give the top frame the type "object" instead of "main_frame".
         // https://code.google.com/p/chromium/issues/detail?id=281711
         details.frameId == 0 && !(details.tabId in framesOfTabs)
       );
 
       var frames = null;
       if (!isMainFrame)
         frames = framesOfTabs[details.tabId];
       if (!frames)
         frames = framesOfTabs[details.tabId] = Object.create(null);
 
       var frame = null;
       var url = new URL(details.url);
       if (!isMainFrame)
       {
         // we are looking for the frame that contains the element that
         // is about to load, however if a frame is loading the surrounding
         // frame is indicated by parentFrameId instead of frameId
         var frameId;
-        if (requestType == "sub_frame")
+        var requestType;
+        if (details.type == "sub_frame")
+        {
           frameId = details.parentFrameId;
+          requestType = "SUBDOCUMENT";
+        }
         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";
+          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 98 matching lines @@
             callback(new Page(tab));
         }
         else
         {
           ext.pages.open(optionsUrl, callback);
         }
       });
     });
   };
 })();