From 1c468035ddfbac527306a4522cec764356b72871 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Tue, 16 Jan 2018 09:13:51 -0500
Subject: [PATCH] fix #3441

---
 platform/webext/vapi-webrequest.js | 47 +++++++++++++-----------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/platform/webext/vapi-webrequest.js b/platform/webext/vapi-webrequest.js
index c2551ffbc..e25b8d164 100644
--- a/platform/webext/vapi-webrequest.js
+++ b/platform/webext/vapi-webrequest.js
@@ -61,46 +61,41 @@ vAPI.net.registerListeners = function() {
     var wrApi = browser.webRequest;
 
     // legacy Chromium understands only these network request types.
-    var validTypes = {
-        main_frame: true,
-        sub_frame: true,
-        stylesheet: true,
-        script: true,
-        image: true,
-        object: true,
-        xmlhttprequest: true,
-        other: true
-    };
+    var validTypes = new Set([
+        'image',
+        'main_frame',
+        'object',
+        'other',
+        'script',
+        'stylesheet',
+        'sub_frame',
+        'xmlhttprequest',
+    ]);
     // modern Chromium/WebExtensions: more types available.
     if ( wrApi.ResourceType ) {
         for ( let typeKey in wrApi.ResourceType ) {
             if ( wrApi.ResourceType.hasOwnProperty(typeKey) ) {
-                validTypes[wrApi.ResourceType[typeKey]] = true;
+                validTypes.add(wrApi.ResourceType[typeKey]);
             }
         }
     }
 
     var denormalizeTypes = function(aa) {
         if ( aa.length === 0 ) {
-            return Object.keys(validTypes);
+            return Array.from(validTypes);
         }
-        var out = [];
-        var i = aa.length,
-            type,
-            needOther = true;
+        var out = new Set(),
+            i = aa.length;
         while ( i-- ) {
-            type = aa[i];
-            if ( validTypes[type] ) {
-                out.push(type);
+            var type = aa[i];
+            if ( validTypes.has(type) ) {
+                out.add(type);
             }
-            if ( type === 'other' ) {
-                needOther = false;
+            if ( type === 'image' && validTypes.has('imageset') ) {
+                out.add('imageset');
             }
         }
-        if ( needOther ) {
-            out.push('other');
-        }
-        return out;
+        return Array.from(out);
     };
 
     var punycode = self.punycode;
@@ -144,7 +139,7 @@ vAPI.net.registerListeners = function() {
         let urls = this.onBeforeRequest.urls || ['<all_urls>'];
         let types = this.onBeforeRequest.types || undefined;
         if (
-            (validTypes.websocket) &&
+            (validTypes.has('websocket')) &&
             (types === undefined || types.indexOf('websocket') !== -1) &&
             (urls.indexOf('<all_urls>') === -1)
         ) {