diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
tree | 871fc667d2de662f171103ce5ec067014ef85e61 /browser/components/urlbar/UrlbarProviderTopSites.sys.mjs | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-upstream/125.0.1.tar.xz firefox-upstream/125.0.1.zip |
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/urlbar/UrlbarProviderTopSites.sys.mjs')
-rw-r--r-- | browser/components/urlbar/UrlbarProviderTopSites.sys.mjs | 100 |
1 files changed, 64 insertions, 36 deletions
diff --git a/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs b/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs index fd178769c8..e9d968f20f 100644 --- a/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs @@ -96,10 +96,9 @@ class ProviderTopSites extends UrlbarProvider { /** * Gets the provider's priority. * - * @param {UrlbarQueryContext} queryContext The query context object * @returns {number} The provider's priority for the given query. */ - getPriority(queryContext) { + getPriority() { return this.PRIORITY; } @@ -140,7 +139,7 @@ class ProviderTopSites extends UrlbarProvider { } // This is done here, rather than in the global scope, because - // TOP_SITES_DEFAULT_ROWS causes the import of Reducers.jsm, and we want to + // TOP_SITES_DEFAULT_ROWS causes the import of Reducers.sys.mjs, and we want to // do that only when actually querying for Top Sites. if (this.topSitesRows === undefined) { XPCOMUtils.defineLazyPreferenceGetter( @@ -199,6 +198,24 @@ class ProviderTopSites extends UrlbarProvider { this.sponsoredSites = sponsoredSites; } + let tabUrlsToContextIds; + if (lazy.UrlbarPrefs.get("suggest.openpage")) { + if (lazy.UrlbarPrefs.get("switchTabs.searchAllContainers")) { + tabUrlsToContextIds = lazy.UrlbarProviderOpenTabs.getOpenTabUrls( + queryContext.isPrivate + ); + } else { + // Build an object compatible with the output of getOpenTabs. + tabUrlsToContextIds = new Map(); + for (let url of lazy.UrlbarProviderOpenTabs.getOpenTabUrlsForUserContextId( + queryContext.userContextId, + queryContext.isPrivate + )) { + tabUrlsToContextIds.set(url, new Set([queryContext.userContextId])); + } + } + } + for (let site of sites) { switch (site.type) { case "url": { @@ -208,49 +225,60 @@ class ProviderTopSites extends UrlbarProvider { icon: site.favicon, isPinned: site.isPinned, isSponsored: site.isSponsored, - sendAttributionRequest: site.sendAttributionRequest, }; - if (site.isSponsored) { - payload = { - ...payload, - sponsoredTileId: site.sponsoredTileId, - sponsoredClickUrl: site.sponsoredClickUrl, - }; + + // Fuzzy match both the URL as-is, and the URL without ref, then + // generate a merged Set. + if (tabUrlsToContextIds) { + let tabUserContextIds = new Set([ + ...(tabUrlsToContextIds.get(site.url) ?? []), + ...(tabUrlsToContextIds.get(site.url.replace(/#.*$/, "")) ?? []), + ]); + if (tabUserContextIds.size) { + for (let userContextId of tabUserContextIds) { + payload.userContextId = userContextId; + let result = new lazy.UrlbarResult( + UrlbarUtils.RESULT_TYPE.TAB_SWITCH, + UrlbarUtils.RESULT_SOURCE.TABS, + ...lazy.UrlbarResult.payloadAndSimpleHighlights( + queryContext.tokens, + payload + ) + ); + addCallback(this, result); + } + break; + } } - let result = new lazy.UrlbarResult( - UrlbarUtils.RESULT_TYPE.URL, - UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, - ...lazy.UrlbarResult.payloadAndSimpleHighlights( - queryContext.tokens, - payload - ) - ); - let tabs; - if (lazy.UrlbarPrefs.get("suggest.openpage")) { - tabs = lazy.UrlbarProviderOpenTabs.getOpenTabs( - queryContext.userContextId || 0, - queryContext.isPrivate - ); + if (site.isSponsored) { + payload.sponsoredTileId = site.sponsoredTileId; + payload.sponsoredClickUrl = site.sponsoredClickUrl; } + payload.sendAttributionRequest = site.sendAttributionRequest; - if (tabs && tabs.includes(site.url.replace(/#.*$/, ""))) { - result.type = UrlbarUtils.RESULT_TYPE.TAB_SWITCH; - result.source = UrlbarUtils.RESULT_SOURCE.TABS; - } else if (lazy.UrlbarPrefs.get("suggest.bookmark")) { + let resultSource = UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL; + if (lazy.UrlbarPrefs.get("suggest.bookmark")) { let bookmark = await lazy.PlacesUtils.bookmarks.fetch({ - url: new URL(result.payload.url), + url: new URL(payload.url), }); + // Check if query has been cancelled. + if (instance != this.queryInstance) { + break; + } if (bookmark) { - result.source = UrlbarUtils.RESULT_SOURCE.BOOKMARKS; + resultSource = UrlbarUtils.RESULT_SOURCE.BOOKMARKS; } } - // Our query has been cancelled. - if (instance != this.queryInstance) { - break; - } - + let result = new lazy.UrlbarResult( + UrlbarUtils.RESULT_TYPE.URL, + resultSource, + ...lazy.UrlbarResult.payloadAndSimpleHighlights( + queryContext.tokens, + payload + ) + ); addCallback(this, result); break; } @@ -305,7 +333,7 @@ class ProviderTopSites extends UrlbarProvider { } } - onEngagement(state, queryContext, details, controller) { + onEngagement(state, queryContext) { if ( !queryContext.isPrivate && this.sponsoredSites && |