summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/fg/js/frame-offset-forwarder.js29
-rw-r--r--ext/manifest.json2
2 files changed, 27 insertions, 4 deletions
diff --git a/ext/fg/js/frame-offset-forwarder.js b/ext/fg/js/frame-offset-forwarder.js
index f40c642d..1a2f3e1e 100644
--- a/ext/fg/js/frame-offset-forwarder.js
+++ b/ext/fg/js/frame-offset-forwarder.js
@@ -22,6 +22,8 @@
class FrameOffsetForwarder {
constructor() {
this._started = false;
+
+ this._cacheMaxSize = 1000;
this._frameCache = new Set();
this._unreachableContentWindowCache = new Set();
@@ -81,7 +83,7 @@ class FrameOffsetForwarder {
}
if (sourceFrame === null) {
// closed shadow root etc.
- this._unreachableContentWindowCache.add(e.source);
+ this._addToCache(this._unreachableContentWindowCache, e.source);
this._forwardFrameOffsetOrigin(null, uniqueId);
return;
}
@@ -99,7 +101,7 @@ class FrameOffsetForwarder {
while (elements.length > 0) {
const element = elements.shift();
if (element.contentWindow === contentWindow) {
- this._frameCache.add(element);
+ this._addToCache(this._frameCache, element);
return element;
}
@@ -124,12 +126,33 @@ class FrameOffsetForwarder {
}
*_getFrameElementSources() {
- yield [...this._frameCache];
+ const frameCache = [];
+ for (const frame of this._frameCache) {
+ // removed from DOM
+ if (!frame.isConnected) {
+ this._frameCache.delete(frame);
+ continue;
+ }
+ frameCache.push(frame);
+ }
+ yield frameCache;
// will contain duplicates, but frame elements are cheap to handle
yield [...document.querySelectorAll('frame, iframe:not(.yomichan-float)')];
yield [document.documentElement];
}
+ _addToCache(cache, value) {
+ let freeSlots = this._cacheMaxSize - cache.size;
+ if (freeSlots <= 0) {
+ for (const cachedValue of cache) {
+ cache.delete(cachedValue);
+ ++freeSlots;
+ if (freeSlots > 0) { break; }
+ }
+ }
+ cache.add(value);
+ }
+
_forwardFrameOffsetParent(offset, uniqueId) {
window.parent.postMessage({action: 'getFrameOffset', params: {offset, uniqueId}}, '*');
}
diff --git a/ext/manifest.json b/ext/manifest.json
index 452b642c..d383dab0 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -71,7 +71,7 @@
"applications": {
"gecko": {
"id": "alex@foosoft.net",
- "strict_min_version": "52.0"
+ "strict_min_version": "53.0"
}
}
}