summaryrefslogtreecommitdiff
path: root/ext/fg
diff options
context:
space:
mode:
authorsiikamiika <siikamiika@users.noreply.github.com>2020-04-18 16:48:49 +0300
committersiikamiika <siikamiika@users.noreply.github.com>2020-04-18 23:28:00 +0300
commitbb3ad78e373b01b64a24fc46712f24964528a24f (patch)
treee2ec20a3e471b9ebf31ad8deb32f1909e5545f0f /ext/fg
parentc992e7f920f20c0c7cc55fddf6aba61e0f8b1641 (diff)
optimize source frame finding
Diffstat (limited to 'ext/fg')
-rw-r--r--ext/fg/js/frame-offset-forwarder.js66
1 files changed, 37 insertions, 29 deletions
diff --git a/ext/fg/js/frame-offset-forwarder.js b/ext/fg/js/frame-offset-forwarder.js
index 2b48ba26..c2df7581 100644
--- a/ext/fg/js/frame-offset-forwarder.js
+++ b/ext/fg/js/frame-offset-forwarder.js
@@ -22,6 +22,7 @@
class FrameOffsetForwarder {
constructor() {
this._started = false;
+ this._frameCache = new Set();
this._forwardFrameOffset = (
window !== window.parent ?
@@ -73,20 +74,11 @@ class FrameOffsetForwarder {
}
_onGetFrameOffset(offset, uniqueId, e) {
- let sourceFrame = null;
- for (const frame of document.querySelectorAll('frame, iframe:not(.yomichan-float)')) {
- if (frame.contentWindow !== e.source) { continue; }
- sourceFrame = frame;
- break;
- }
-
+ const sourceFrame = this._findFrameWithContentWindow(e.source);
if (sourceFrame === null) {
- sourceFrame = this._getOpenShadowRootSourceFrame(e.source);
- if (!sourceFrame) {
- // closed shadow root etc.
- this._forwardFrameOffsetOrigin(null, uniqueId);
- return;
- }
+ // closed shadow root etc.
+ this._forwardFrameOffsetOrigin(null, uniqueId);
+ return;
}
const [forwardedX, forwardedY] = offset;
@@ -96,22 +88,38 @@ class FrameOffsetForwarder {
this._forwardFrameOffset(offset, uniqueId);
}
- _getOpenShadowRootSourceFrame(sourceWindow) {
- const getShadowRootElements = (documentOrElement) => {
- const elements = Array.from(documentOrElement.querySelectorAll('*'))
- .filter((el) => !!el.shadowRoot);
- const childElements = elements
- .map((el) => el.shadowRoot)
- .map(getShadowRootElements);
- elements.push(childElements.flat());
-
- return elements.flat();
- };
-
- return getShadowRootElements(document)
- .map((el) => Array.from(el.shadowRoot.querySelectorAll('frame, iframe:not(.yomichan-float)')))
- .flat()
- .find((el) => el.contentWindow === sourceWindow);
+ _findFrameWithContentWindow(contentWindow) {
+ const elements = [
+ ...this._frameCache,
+ // will contain duplicates, but frame elements are cheap to handle
+ ...document.querySelectorAll('frame, iframe:not(.yomichan-float)'),
+ document.documentElement
+ ];
+ const ELEMENT_NODE = Node.ELEMENT_NODE;
+ while (elements.length > 0) {
+ const element = elements.shift();
+ if (element.contentWindow === contentWindow) {
+ this._frameCache.add(element);
+ return element;
+ }
+
+ const shadowRoot = element.shadowRoot;
+ if (shadowRoot) {
+ for (const child of shadowRoot.children) {
+ if (child.nodeType === ELEMENT_NODE) {
+ elements.push(child);
+ }
+ }
+ }
+
+ for (const child of element.children) {
+ if (child.nodeType === ELEMENT_NODE) {
+ elements.push(child);
+ }
+ }
+ }
+
+ return null;
}
_forwardFrameOffsetParent(offset, uniqueId) {