From 6dca8969b05e640b78f37ea44fd83a8560cf9843 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sun, 16 Aug 2020 06:03:34 -0400
Subject: [PATCH] Revert latest changes

Related commit:
- https://github.com/gorhill/uBlock/commit/d39b6d058aa23b3efe0fac25523a2396a2bc84c3
- https://github.com/gorhill/uBlock/commit/94650e260e70bb08089a55d2d7871479bacb97aa
---
 .../window.open-defuser.js                    | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/web_accessible_resources/window.open-defuser.js b/src/web_accessible_resources/window.open-defuser.js
index 755f18ce7..6a0f24689 100644
--- a/src/web_accessible_resources/window.open-defuser.js
+++ b/src/web_accessible_resources/window.open-defuser.js
@@ -40,7 +40,7 @@
             targetResult = false;
             pattern = pattern.slice(1);
         }
-        autoRemoveAfter = parseInt(arg2, 10);
+        autoRemoveAfter = parseInt(arg2);
         if ( isNaN(autoRemoveAfter) ) {
             autoRemoveAfter = -1;
         } 
@@ -66,28 +66,22 @@
                 return target.apply(thisArg, args);
             }
             if ( autoRemoveAfter < 0 ) { return null; }
-            const decoy = document.createElement('object');
-            decoy.data = url;
-            decoy.style.setProperty('height','1px', 'important');
-            decoy.style.setProperty('position','fixed', 'important');
-            decoy.style.setProperty('top','-1px', 'important');
-            decoy.style.setProperty('width','1px', 'important');
-            document.body.appendChild(decoy);
-            setTimeout(( ) => decoy.remove(), autoRemoveAfter * 1000);
-            const noopFn = function(){};
-            return new Proxy(decoy.contentWindow || decoy , {
+            const iframe = document.createElement('iframe');
+            iframe.src = url;
+            iframe.style.setProperty('display','none', 'important');
+            iframe.style.setProperty('height','1px', 'important');
+            iframe.style.setProperty('width','1px', 'important');
+            document.body.appendChild(iframe);
+            setTimeout(( ) => iframe.remove(), autoRemoveAfter * 1000);
+            if ( arg3 === '' ) { return iframe.contentWindow; }
+            return new Proxy(iframe.contentWindow, {
                 get: function(target, prop) {
                     log('window.open / get', prop, '===', target[prop]);
-                    if ( prop === 'closed' ) { return false; }
-                    const r = Reflect.get(...arguments);
-                    if ( typeof r === 'function' ) {
-                        return noopFn.bind(null);
-                    }
-                    return r;
+                    return target[prop];
                 },
                 set: function(target, prop, value) {
                     log('window.open / set', prop, '=', value);
-                    return Reflect.set(...arguments);
+                    target[prop] = value;
                 },
             });
         }