tor-browser

commit 1e419fb4ce8b2389a0be07a270a536e51df35740
parent 2d5ba72330b951dcd0abe3aeddc29830b8d663cc
Author: Mark Banner <standard8@mozilla.com>
Date:   Wed, 22 Oct 2025 13:23:01 +0000

Bug 1995587 - Store the searchString in the UrlbarEventBufferer events queue, rather than on the event itself. r=urlbar-reviewers,daisuke

There's no need to store it on the event, and this avoids having to define a special type.

Differential Revision: https://phabricator.services.mozilla.com/D269427

Diffstat:
M
browser/components/urlbar/UrlbarEventBufferer.sys.mjs
 | 
17
++++++++++-------

1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/browser/components/urlbar/UrlbarEventBufferer.sys.mjs b/browser/components/urlbar/UrlbarEventBufferer.sys.mjs
@@ -165,10 +165,13 @@ export class UrlbarEventBufferer {
       throw new Error(`Event ${event.type}:${event.keyCode} already deferred!`);
     }
     lazy.logger.debug(`Deferring ${event.type}:${event.keyCode} event`);
-    // Also store the current search string, as an added safety check. If the
-    // string will differ later, the event is stale and should be dropped.
-    event.searchString = this.#lastQuery.context.searchString;
-    this.#eventsQueue.push({ event, callback });
+    this.#eventsQueue.push({
+      event,
+      callback,
+      // Also store the current search string, as an added safety check. If the
+      // string will differ later, the event is stale and should be dropped.
+      searchString: this.#lastQuery.context.searchString,
+    });
 
     if (!this.#deferringTimeout) {
       let elapsed = ChromeUtils.now() - this.#lastQuery.startDate;
@@ -199,7 +202,7 @@ export class UrlbarEventBufferer {
       return;
     }
 
-    let { event, callback } = this.#eventsQueue[0];
+    let { event, callback, searchString } = this.#eventsQueue[0];
     if (onlyIfSafe && !this.isSafeToPlayDeferredEvent(event)) {
       return;
     }
@@ -207,7 +210,7 @@ export class UrlbarEventBufferer {
     // Remove the event from the queue and play it.
     this.#eventsQueue.shift();
     // Safety check: handle only if the search string didn't change meanwhile.
-    if (event.searchString == this.#lastQuery.context.searchString) {
+    if (searchString == this.#lastQuery.context.searchString) {
       callback();
     }
     Services.tm.dispatchToMainThread(() => {
@@ -367,7 +370,7 @@ export class UrlbarEventBufferer {
    * but it may also never be invoked, if the context changed and the event
    * became obsolete.
    *
-   * @type {{event: KeyboardEvent, callback: () => void}[]}
+   * @type {{event: KeyboardEvent, callback: () => void, searchString: string}[]}
    */
   #eventsQueue = [];