Bypass TabFavIconHelper for data: URI favicons

piroor · Jul 15, 2023 · a9d8741 · a9d8741
1 parent e3a15e6
commit a9d8741
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/webextensions/common/tst-api.js b/webextensions/common/tst-api.js
@@ -281,7 +281,9 @@ export class TreeItem {
     const [effectiveFavIconUrl, children] = await Promise.all([
       (sourceTab.id in this.cache.effectiveFavIconUrls) ?
         this.cache.effectiveFavIconUrls[sourceTab.id] :
-        TabFavIconHelper.getLastEffectiveFavIconURL(sourceTab).catch(ApiTabs.handleMissingTabError),
+        (sourceTab.favIconUrl && sourceTab.favIconUrl.startsWith('data:')) ?
+          sourceTab.favIconUrl :
+          TabFavIconHelper.getLastEffectiveFavIconURL(sourceTab).catch(ApiTabs.handleMissingTabError),
       doProgressively(
         sourceTab.$TST.children,
         child => this.exportTab(child, permissions, commonCacheKey),

diff --git a/webextensions/sidebar/components/TabElement.js b/webextensions/sidebar/components/TabElement.js
@@ -604,11 +604,17 @@ windowId = ${tab.windowId}
     if (!this.initialized || !this.$TST)
       return url;
 
+    if (url.startsWith('data:')) { // we don't need to use the helper for data: URI.
+      this.favicon.src = url;
+      return url;
+    }
+
     TabFavIconHelper.loadToImage({
       image: this.favicon,
       tab: this.$TST.tab,
       url
     });
+    return url;
   }
 
   get overflow() {