From b6c4914b79d96b06760093be8957fbb1730eff3b Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Thu, 19 Mar 2020 00:24:14 +0200
Subject: [PATCH] simplify popup prepare

---
 ext/fg/js/popup-proxy-host.js | 10 +++++-----
 ext/fg/js/popup.js            | 28 ++++------------------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
index 6f1c13c6..4dc79943 100644
--- a/ext/fg/js/popup-proxy-host.js
+++ b/ext/fg/js/popup-proxy-host.js
@@ -26,17 +26,17 @@ class PopupProxyHost {
     constructor() {
         this._popups = new Map();
         this._apiReceiver = null;
-        this._frameIdPromise = null;
+        this._frameId = null;
     }
 
     // Public functions
 
     async prepare() {
-        this._frameIdPromise = apiFrameInformationGet();
-        const {frameId} = await this._frameIdPromise;
+        const {frameId} = await apiFrameInformationGet();
         if (typeof frameId !== 'number') { return; }
+        this._frameId = frameId;
 
-        this._apiReceiver = new FrontendApiReceiver(`popup-proxy-host#${frameId}`, new Map([
+        this._apiReceiver = new FrontendApiReceiver(`popup-proxy-host#${this._frameId}`, new Map([
             ['getOrCreatePopup', this._onApiGetOrCreatePopup.bind(this)],
             ['setOptions', this._onApiSetOptions.bind(this)],
             ['hide', this._onApiHide.bind(this)],
@@ -87,7 +87,7 @@ class PopupProxyHost {
         } else if (depth === null) {
             depth = 0;
         }
-        const popup = new Popup(id, depth, this._frameIdPromise);
+        const popup = new Popup(id, depth, this._frameId);
         if (parent !== null) {
             popup.setParent(parent);
         }
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index e6596a1a..5b8724ae 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -23,11 +23,10 @@
  */
 
 class Popup {
-    constructor(id, depth, frameIdPromise) {
+    constructor(id, depth, frameId) {
         this._id = id;
         this._depth = depth;
-        this._frameIdPromise = frameIdPromise;
-        this._frameId = null;
+        this._frameId = frameId;
         this._parent = null;
         this._child = null;
         this._childrenSupported = true;
@@ -80,16 +79,8 @@ class Popup {
         return false;
     }
 
-    async broadcastRootPopupInformation() {
+    broadcastRootPopupInformation() {
         if (this._depth === 0) {
-            try {
-                const {frameId} = await this._frameIdPromise;
-                if (typeof frameId === 'number') {
-                    this._frameId = frameId;
-                }
-            } catch (e) {
-                // NOP
-            }
             apiForward('rootPopupInformation', {popupId: this._id, frameId: this._frameId});
         }
     }
@@ -208,18 +199,7 @@ class Popup {
     }
 
     async _createInjectPromise() {
-        try {
-            const {frameId} = await this._frameIdPromise;
-            if (typeof frameId === 'number') {
-                this._frameId = frameId;
-            }
-        } catch (e) {
-            // NOP
-        }
-
-        if (this._depth === 0) {
-            apiForward('rootPopupInformation', {popupId: this._id, frameId: this._frameId});
-        }
+        this.broadcastRootPopupInformation();
 
         if (this._messageToken === null) {
             this._messageToken = await apiGetMessageToken();