From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/chrome-webidl/ChromeUtils.webidl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'dom/chrome-webidl/ChromeUtils.webidl')

diff --git a/dom/chrome-webidl/ChromeUtils.webidl b/dom/chrome-webidl/ChromeUtils.webidl
index 443afcb86d..3ccb125a1e 100644
--- a/dom/chrome-webidl/ChromeUtils.webidl
+++ b/dom/chrome-webidl/ChromeUtils.webidl
@@ -327,6 +327,8 @@ namespace ChromeUtils {
    *
    * In worker threads, aOption is required and only { global: "current" } and
    * { global: "contextual" } are supported.
+   *
+   * In DevTools distinct global, aOptions.global is reuiqred.
    */
   [Throws]
   object importESModule(DOMString aResourceURI,
@@ -344,6 +346,8 @@ namespace ChromeUtils {
    *
    * In worker threads, aOption is required and only { global: "current" } and
    * { global: "contextual" } are supported.
+   *
+   * In DevTools distinct global, aOptions.global is reuiqred.
    */
   [Throws]
   undefined defineESModuleGetters(object aTarget, object aModules,
@@ -540,6 +544,9 @@ partial namespace ChromeUtils {
    * the same file will not cause the module to be re-evaluated, but
    * the symbols in EXPORTED_SYMBOLS will be exported into the
    * specified target object and the global object returned as above.
+   *
+   * TODO: Remove this once m-c, c-c, and out-of-tree code migrations finish
+   *       (bug 1881888).
    */
   [Throws]
   object import(UTF8String aResourceURI, optional object aTargetObj);
@@ -947,7 +954,6 @@ dictionary IOActivityDataDictionary {
 [GenerateInitFromJSON]
 dictionary OriginAttributesDictionary {
   unsigned long userContextId = 0;
-  boolean inIsolatedMozBrowser = false;
   unsigned long privateBrowsingId = 0;
   DOMString firstPartyDomain = "";
   DOMString geckoViewSessionContextId = "";
@@ -957,7 +963,6 @@ dictionary OriginAttributesDictionary {
 [GenerateInitFromJSON, GenerateToJSON]
 dictionary OriginAttributesPatternDictionary {
   unsigned long userContextId;
-  boolean inIsolatedMozBrowser;
   unsigned long privateBrowsingId;
   DOMString firstPartyDomain;
   DOMString geckoViewSessionContextId;
@@ -1030,13 +1035,8 @@ enum ImportESModuleTargetGlobal {
 };
 
 dictionary ImportESModuleOptionsDictionary {
-  /**
-   * If true, a distinct module loader will be used, in the system principal,
-   * but with a distinct global so that the DevTools can load a distinct set
-   * of modules and do not interfere with its debuggee.
-   */
-  boolean loadInDevToolsLoader;
-
+  // This field is required for importESModule and defineESModuleGetters in
+  // DevTools distinct global.
   ImportESModuleTargetGlobal global;
 };
 
-- 
cgit v1.2.3