Issue 4722 - Drop support for Chrome 41 - 48

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 184 matching lines @@
 
 
   /* Browser actions */
 
   var BrowserAction = function(tabId)
   {
     this._tabId = tabId;
     this._changes = null;
   };
   BrowserAction.prototype = {
-    _legacySetIcon: function(details)
-    {
-      var legacyDetails = {};
-      for (var key in details)
-      {
-        var value = details[key];
-        if (typeof value == "object")
-          value = {19: value[19], 38: value[38]};
-        legacyDetails[key] = value;
-      }
-      chrome.browserAction.setIcon(legacyDetails);
-    },
-    _safeSetIcon: function(details)
-    {
-      try
-      {
-        chrome.browserAction.setIcon(details);
-      }
-      catch (e)
-      {
-        // Older versions of Chrome do not allow any sizes other than 19 and 38
-        // to be present, but newer versions of Chrome (and Edge) prefer
-        // different sizes.
-        this._safeSetIcon = this._legacySetIcon;
-        this._legacySetIcon(details);
-      }
-    },
     _applyChanges: function()
     {
       if ("iconPath" in this._changes)
       {
-        this._safeSetIcon({
+        chrome.browserAction.setIcon({
           tabId: this._tabId,
           path: {
             16: this._changes.iconPath.replace("$size", "16"),
             19: this._changes.iconPath.replace("$size", "19"),
             20: this._changes.iconPath.replace("$size", "20"),
             32: this._changes.iconPath.replace("$size", "32"),
             38: this._changes.iconPath.replace("$size", "38"),
             40: this._changes.iconPath.replace("$size", "40")
           }
         });
@@ skipping 184 matching lines @@
     onBeforeRequest: new ext._EventTarget(),
     handlerBehaviorChanged: function()
     {
       // Defer handlerBehaviorChanged() until navigation occurs.
       // There wouldn't be any visible effect when calling it earlier,
       // but it's an expensive operation and that way we avoid to call
       // it multiple times, if multiple filters are added/removed.
       var onBeforeNavigate = chrome.webNavigation.onBeforeNavigate;
       if (!onBeforeNavigate.hasListener(propagateHandlerBehaviorChange))
         onBeforeNavigate.addListener(propagateHandlerBehaviorChange);
-    },
-    getIndistinguishableTypes: function()
-    {
-      // Chrome 38-48 mistakenly reports requests of type `object`
-      // (e.g. requests initiated by Flash) with the type `other`.
-      // https://code.google.com/p/chromium/issues/detail?id=410382
-      var match = navigator.userAgent.match(/\bChrome\/(\d+)/);
-      if (match)
-      {
-        var version = parseInt(match[1], 10);
-        if (version >= 38 && version <= 48)
-          return [["OTHER", "OBJECT", "OBJECT_SUBREQUEST"]];
-      }
-
-      // Chrome <44 doesn't have ResourceType.
-      var ResourceType = chrome.webRequest.ResourceType || {};
-
-      // Before Chrome 49, requests of the type `font` and `ping`
-      // have been reported with the type `other`.
-      // https://code.google.com/p/chromium/issues/detail?id=410382
-      var otherTypes = ["OTHER", "MEDIA"];
-      if (!("FONT" in ResourceType))
-        otherTypes.push("FONT");
-      if (!("PING" in ResourceType))
-        otherTypes.push("PING");
-
-      return [["OBJECT", "OBJECT_SUBREQUEST"], otherTypes];
     }
   };
 
   chrome.tabs.query({}, function(tabs)
   {
     tabs.forEach(function(tab)
     {
       chrome.webNavigation.getAllFrames({tabId: tab.id}, function(details)
       {
         if (details && details.length > 0)
@@ skipping 69 matching lines @@
       sender.page = new Page(rawSender.tab);
       sender.frame = {
         url: new URL(rawSender.url),
         get parent()
         {
           var frames = framesOfTabs[rawSender.tab.id];
 
           if (!frames)
             return null;
 
-          if ("frameId" in rawSender)
-          {
-            // Chrome 41+
-            var frame = frames[rawSender.frameId];
-            if (frame)
-              return frame.parent;
-          }
-          else
-          {
-            // Chrome 28-40
-            for (var frameId in frames)
-            {
-              if (frames[frameId].url.href == this.url.href)
-                return frames[frameId].parent;
-            }
-          }
+          var frame = frames[rawSender.frameId];
+          if (frame)
+            return frame.parent;
 
           return frames[0];
         }
       };
     }
 
     return ext.onMessage._dispatch(message, sender, sendResponse).indexOf(true) != -1;
   });
 
 
@@ skipping 65 matching lines @@
   ext.windows = {
     create: function(createData, callback)
     {
       chrome.windows.create(createData, function(createdWindow)
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 })();