Issue 4364 - Drop support for Chrome 29-40 and remove legacy code

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 92 matching lines @@
     onActivated: new ext._EventTarget(),
     onRemoved: new ext._EventTarget()
   };
 
   chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab)
   {
     if (changeInfo.status == "loading")
       ext.pages.onLoading._dispatch(new Page(tab));
   });
 
   function createFrame(tabId, frameId)

[Sebastian Noack, 2016/09/09 14:39:51]

The changes here are due to rebasing.

[kzar, 2016/09/13 12:30:01]

Acknowledged.

   {
     var frames = framesOfTabs[tabId];
     if (!frames)
       frames = framesOfTabs[tabId] = Object.create(null);
 
     var frame = frames[frameId];
     if (!frame)
       frame = frames[frameId] = {};
 
     return frame;
@@ skipping 352 matching lines @@
             if (parentFrameId != -1)
               frames[details[i].frameId].parent = frames[parentFrameId];
           }
         }
       });
     });
   });
 
   chrome.webRequest.onBeforeRequest.addListener(function(details)
   {
-    // 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)
+    // the high-level code isn't interested in requests that aren't
+    // related to a tab or requests loading a top-level document,
+    // those should never be blocked
+    if (details.tabId == -1 || details.type == "main_frame")
       return;
 
-    var isMainFrame = details.type == "main_frame" || (
-      // assume that the first request belongs to the top frame. Chrome 29
-      // 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)
-    );
+    // 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;
+    var requestType;
+    if (details.type == "sub_frame")
+    {
+      frameId = details.parentFrameId;
+      requestType = "SUBDOCUMENT";
+    }
+    else
+    {
+      frameId = details.frameId;
+      requestType = details.type.toUpperCase();
+    }
 
-    if (!isMainFrame)
+    var frame = ext.getFrame(details.tabId, frameId);
+    if (frame)
     {
-      // 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;
-      var requestType;
-      if (details.type == "sub_frame")
-      {
-        frameId = details.parentFrameId;
-        requestType = "SUBDOCUMENT";
-      }
-      else
-      {
-        frameId = details.frameId;
-        requestType = details.type.toUpperCase();
-      }
+      var results = ext.webRequest.onBeforeRequest._dispatch(
+        new URL(details.url),
+        requestType,
+        new Page({id: details.tabId}),
+        frame
+      );
 
-      var frame = ext.getFrame(details.tabId, frameId);
-      if (frame)
-      {
-        var results = ext.webRequest.onBeforeRequest._dispatch(
-          new URL(details.url),
-          requestType,
-          new Page({id: details.tabId}),
-          frame
-        );
-
-        if (results.indexOf(false) != -1)
-          return {cancel: true};
-      }
+      if (results.indexOf(false) != -1)
+        return {cancel: true};
     }
   }, {urls: ["http://*/*", "https://*/*"]}, ["blocking"]);
 
 
   /* Message passing */
 
   chrome.runtime.onMessage.addListener(function(message, rawSender, sendResponse)
   {
     var sender = {};
 
@@ skipping 96 matching lines @@
   ext.windows = {
     create: function(createData, callback)
     {
       chrome.windows.create(createData, function(createdWindow)
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 })();