GitLab

at 2025-06-26T11:37:44+02:00

fixup! BB 40925: Implemented the Security Level component

Restore the resource:// URL for SecurityLevel.sys.mjs.

fixup! TB 42891: Set the bundled search engine for Tor Browser.

TB 43728: Update our custom icon fetching code.

Upstream added the possibility to have search engine icons in various
size, so we needed to update our code for getting search engines.

    *   source object or null of there is no icon with the supplied width.

    */

   async createIconURL(iconRecord) {

-    let iconData;

-    try {

-      iconData = await this.#iconCollection.attachments.get(iconRecord);

-    } catch (ex) {

-      console.error(ex);

-    }

-    if (!iconData) {

-      console.warn("Unable to find the attachment for", iconRecord.id);

-      // Queue an update in case we haven't downloaded it yet.

-      this.#pendingUpdatesMap.set(iconRecord.id, iconRecord);

-      this.#maybeQueueIdle();

-      return null;

-    }

-

-    if (iconData.record.last_modified != iconRecord.last_modified) {

-      // The icon we have stored is out of date, queue an update so that we'll

-      // download the new icon.

-      this.#pendingUpdatesMap.set(iconRecord.id, iconRecord);

-      this.#maybeQueueIdle();

-    }

-    return URL.createObjectURL(

-      new Blob([iconData.buffer], { type: iconRecord.attachment.mimetype })

-    );

+    return iconRecord.url;

   }

   QueryInterface = ChromeUtils.generateQI(["nsIObserver"]);

   async #buildIconMap() {

     try {

       this.#iconMap = new Map(

-        await (

-          await fetch(

-            "chrome://global/content/search/torBrowserSearchEngineIcons.json"

-          )

-        ).json()

+        Object.entries(

+          await (

+            await fetch(

+              "chrome://global/content/search/torBrowserSearchEngineIcons.json"

+            )

+          ).json()

+        )

       );

     } catch (ex) {

       console.error(ex);

 ChromeUtils.defineESModuleGetters(lazy, {

   SearchSettings: "moz-src:///toolkit/components/search/SearchSettings.sys.mjs",

   SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",

-  SecurityLevelPrefs: "moz-src:///toolkit/modules/SecurityLevel.sys.mjs",

+  SecurityLevelPrefs: "resource://gre/modules/SecurityLevel.sys.mjs",

   OpenSearchEngine:

     "moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs",

 });

-[

-  ["ddg", "chrome://global/content/search/duckduckgo.ico"],

-  ["ddg-onion", "chrome://global/content/search/duckduckgo.ico"],

-  ["startpage", "chrome://global/content/search/startpage.png"],

-  ["startpage-onion", "chrome://global/content/search/startpage.png"],

-  ["wikipedia", "chrome://global/content/search/wikipedia.ico"]

-]
+{

+  "ddg": [

+    {

+      "url": "chrome://global/content/search/duckduckgo.ico",

+      "imageSize": 16

+    }

+  ],

+  "ddg-onion": [

+    {

+      "url": "chrome://global/content/search/duckduckgo.ico",

+      "imageSize": 16

+    }

+  ],

+  "startpage": [

+    {

+      "url": "chrome://global/content/search/startpage.png",

+      "imageSize": 16

+    }

+  ],

+  "startpage-onion": [

+    {

+      "url": "chrome://global/content/search/startpage.png",

+      "imageSize": 16

+    }

+  ],

+  "wikipedia": [

+    {

+      "url": "chrome://global/content/search/wikipedia.ico",

+      "imageSize": 16

+    }

+  ]

+}

Pier Angelo Vendrame pushed to branch tor-browser-140.0a1-15.0-2 at The Tor Project / Applications / Tor Browser

Commits:

3 changed files:

Changes: