Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 55 insertions, 0 deletions

diff --git a/mobile/android/modules/geckoview/GeckoViewWebExtension.sys.mjs b/mobile/android/modules/geckoview/GeckoViewWebExtension.sys.mjs
index 97538fd6bb..749f753626 100644
--- a/mobile/android/modules/geckoview/GeckoViewWebExtension.sys.mjs
+++ b/mobile/android/modules/geckoview/GeckoViewWebExtension.sys.mjs
@@ -1222,6 +1222,61 @@ export var GeckoViewWebExtension = {
         break;
       }
 
+      case "GeckoView:WebExtension:AddOptionalPermissions": {
+        const { extensionId, permissions, origins } = aData;
+        try {
+          const addon = await this.extensionById(extensionId);
+          const normalized = lazy.ExtensionPermissions.normalizeOptional(
+            {
+              permissions,
+              origins,
+            },
+            addon.optionalPermissions
+          );
+          const policy = WebExtensionPolicy.getByID(addon.id);
+          await lazy.ExtensionPermissions.add(
+            extensionId,
+            normalized,
+            policy?.extension
+          );
+          const extension = await exportExtension(
+            addon,
+            addon.userPermissions,
+            /* aSourceURI */ null
+          );
+          aCallback.onSuccess({ extension });
+        } catch (ex) {
+          aCallback.onError(`Unexpected error: ${ex}`);
+        }
+        break;
+      }
+
+      case "GeckoView:WebExtension:RemoveOptionalPermissions": {
+        const { extensionId, permissions, origins } = aData;
+        try {
+          const addon = await this.extensionById(extensionId);
+          const normalized = lazy.ExtensionPermissions.normalizeOptional(
+            { permissions, origins },
+            addon.optionalPermissions
+          );
+          const policy = WebExtensionPolicy.getByID(addon.id);
+          await lazy.ExtensionPermissions.remove(
+            addon.id,
+            normalized,
+            policy?.extension
+          );
+          const extension = await exportExtension(
+            addon,
+            addon.userPermissions,
+            /* aSourceURI */ null
+          );
+          aCallback.onSuccess({ extension });
+        } catch (ex) {
+          aCallback.onError(`Unexpected error: ${ex}`);
+        }
+        break;
+      }
+
       case "GeckoView:WebExtension:Install": {
         const { locationUri, installId, installMethod } = aData;
         let uri;