Display fixes (#1648)

* Fix incorrect tabId/frameId being used

* Only enable nested popups if the tabId is valid

* Remove unused APIs

1 files changed, 8 insertions, 12 deletions

diff --git a/ext/js/display/display.js b/ext/js/display/display.js
index 720e1de5..6895ea74 100644
--- a/ext/js/display/display.js
+++ b/ext/js/display/display.js
@@ -194,14 +194,6 @@ class Display extends EventDispatcher {
         return this._progressIndicatorVisible;
     }
 
-    get tabId() {
-        return this._tabId;
-    }
-
-    get frameId() {
-        return this._frameId;
-    }
-
     get parentPopupId() {
         return this._parentPopupId;
     }
@@ -1635,10 +1627,14 @@ class Display extends EventDispatcher {
 
     async _updateNestedFrontend(options) {
         const isSearchPage = (this._pageType === 'search');
-        const isEnabled = this._childrenSupported && (
-            (isSearchPage) ?
-            (options.scanning.enableOnSearchPage) :
-            (this._depth < options.scanning.popupNestingMaxDepth)
+        const isEnabled = (
+            this._childrenSupported &&
+            typeof this._tabId === 'number' &&
+            (
+                (isSearchPage) ?
+                (options.scanning.enableOnSearchPage) :
+                (this._depth < options.scanning.popupNestingMaxDepth)
+            )
         );
 
         if (this._frontend === null) {