Popup proxy host refactor (#516)

* Rename PopupProxyHost to PopupFactory

* Update FrontendApiReceiver to support non-async handlers

* Make some functions non-async

* Make setCustomCss non-async

* Make setContentScale non-async

* Remove static

* Rename variables

* Pass frameId into PopupFactory's constructor

* Change FrontendApiReceiver source from popup-proxy-host to popup-factor

* Rename _invokeHostApi to _invoke

* Rename PopupProxy.getHostUrl to getUrl

1 files changed, 0 insertions, 186 deletions

diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js
deleted file mode 100644
index 39150bc7..00000000
--- a/ext/fg/js/popup-proxy-host.js
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2019-2020  Yomichan Authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/* global
- * FrontendApiReceiver
- * Popup
- * apiFrameInformationGet
- */
-
-class PopupProxyHost {
-    constructor() {
-        this._popups = new Map();
-        this._frameId = null;
-    }
-
-    // Public functions
-
-    async prepare() {
-        const {frameId} = await apiFrameInformationGet();
-        if (typeof frameId !== 'number') { return; }
-        this._frameId = frameId;
-
-        const apiReceiver = new FrontendApiReceiver(`popup-proxy-host#${this._frameId}`, new Map([
-            ['getOrCreatePopup', this._onApiGetOrCreatePopup.bind(this)],
-            ['setOptionsContext', this._onApiSetOptionsContext.bind(this)],
-            ['hide', this._onApiHide.bind(this)],
-            ['isVisible', this._onApiIsVisibleAsync.bind(this)],
-            ['setVisibleOverride', this._onApiSetVisibleOverride.bind(this)],
-            ['containsPoint', this._onApiContainsPoint.bind(this)],
-            ['showContent', this._onApiShowContent.bind(this)],
-            ['setCustomCss', this._onApiSetCustomCss.bind(this)],
-            ['clearAutoPlayTimer', this._onApiClearAutoPlayTimer.bind(this)],
-            ['setContentScale', this._onApiSetContentScale.bind(this)],
-            ['getHostUrl', this._onApiGetHostUrl.bind(this)]
-        ]));
-        apiReceiver.prepare();
-    }
-
-    getOrCreatePopup(id=null, parentId=null, depth=null) {
-        // Find by existing id
-        if (id !== null) {
-            const popup = this._popups.get(id);
-            if (typeof popup !== 'undefined') {
-                return popup;
-            }
-        }
-
-        // Find by existing parent id
-        let parent = null;
-        if (parentId !== null) {
-            parent = this._popups.get(parentId);
-            if (typeof parent !== 'undefined') {
-                const popup = parent.child;
-                if (popup !== null) {
-                    return popup;
-                }
-            } else {
-                parent = null;
-            }
-        }
-
-        // New unique id
-        if (id === null) {
-            id = yomichan.generateId(16);
-        }
-
-        // Create new popup
-        if (parent !== null) {
-            if (depth !== null) {
-                throw new Error('Depth cannot be set when parent exists');
-            }
-            depth = parent.depth + 1;
-        } else if (depth === null) {
-            depth = 0;
-        }
-        const popup = new Popup(id, depth, this._frameId);
-        if (parent !== null) {
-            popup.setParent(parent);
-        }
-        this._popups.set(id, popup);
-        return popup;
-    }
-
-    // API message handlers
-
-    async _onApiGetOrCreatePopup({id, parentId}) {
-        const popup = this.getOrCreatePopup(id, parentId);
-        return {
-            id: popup.id
-        };
-    }
-
-    async _onApiSetOptionsContext({id, optionsContext, source}) {
-        const popup = this._getPopup(id);
-        return await popup.setOptionsContext(optionsContext, source);
-    }
-
-    async _onApiHide({id, changeFocus}) {
-        const popup = this._getPopup(id);
-        return popup.hide(changeFocus);
-    }
-
-    async _onApiIsVisibleAsync({id}) {
-        const popup = this._getPopup(id);
-        return await popup.isVisible();
-    }
-
-    async _onApiSetVisibleOverride({id, visible}) {
-        const popup = this._getPopup(id);
-        return await popup.setVisibleOverride(visible);
-    }
-
-    async _onApiContainsPoint({id, x, y}) {
-        const popup = this._getPopup(id);
-        [x, y] = PopupProxyHost._convertPopupPointToRootPagePoint(popup, x, y);
-        return await popup.containsPoint(x, y);
-    }
-
-    async _onApiShowContent({id, elementRect, writingMode, type, details, context}) {
-        const popup = this._getPopup(id);
-        elementRect = PopupProxyHost._convertJsonRectToDOMRect(popup, elementRect);
-        if (!PopupProxyHost._popupCanShow(popup)) { return; }
-        return await popup.showContent(elementRect, writingMode, type, details, context);
-    }
-
-    async _onApiSetCustomCss({id, css}) {
-        const popup = this._getPopup(id);
-        return popup.setCustomCss(css);
-    }
-
-    async _onApiClearAutoPlayTimer({id}) {
-        const popup = this._getPopup(id);
-        return popup.clearAutoPlayTimer();
-    }
-
-    async _onApiSetContentScale({id, scale}) {
-        const popup = this._getPopup(id);
-        return popup.setContentScale(scale);
-    }
-
-    async _onApiGetHostUrl() {
-        return window.location.href;
-    }
-
-    // Private functions
-
-    _getPopup(id) {
-        const popup = this._popups.get(id);
-        if (typeof popup === 'undefined') {
-            throw new Error(`Invalid popup ID ${id}`);
-        }
-        return popup;
-    }
-
-    static _convertJsonRectToDOMRect(popup, jsonRect) {
-        const [x, y] = PopupProxyHost._convertPopupPointToRootPagePoint(popup, jsonRect.x, jsonRect.y);
-        return new DOMRect(x, y, jsonRect.width, jsonRect.height);
-    }
-
-    static _convertPopupPointToRootPagePoint(popup, x, y) {
-        if (popup.parent !== null) {
-            const popupRect = popup.parent.getContainerRect();
-            x += popupRect.x;
-            y += popupRect.y;
-        }
-        return [x, y];
-    }
-
-    static _popupCanShow(popup) {
-        return popup.parent === null || popup.parent.isVisibleSync();
-    }
-}