Merging upstream version 125.0.1.

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

1 files changed, 21 insertions, 0 deletions

diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index bf736e9ac2..7eed2593aa 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1006,6 +1006,18 @@ DOMInterfaces = {
     'wrapperCache': False,
 },
 
+'TrustedHTML': {
+    'wrapperCache': False,
+},
+
+'TrustedScript': {
+    'wrapperCache': False,
+},
+
+'TrustedScriptURL': {
+    'wrapperCache': False,
+},
+
 'UserInteraction': {
     'nativeType': 'mozilla::telemetry::UserInteractionStopwatch',
     'headerFile': 'mozilla/telemetry/Stopwatch.h',
@@ -1527,6 +1539,10 @@ DOMInterfaces = {
     'nativeType': 'mozilla::glean::GleanText',
     'headerFile': 'mozilla/glean/bindings/Text.h',
 },
+'GleanObject': {
+    'nativeType': 'mozilla::glean::GleanObject',
+    'headerFile': 'mozilla/glean/bindings/Object.h',
+},
 
 'Window': {
     'nativeType': 'nsGlobalWindowInner',
@@ -1962,6 +1978,11 @@ if buildconfig.substs.get("ENABLE_TESTS", False):
         'register': False,
     },
 
+    'TestCallbackDictUnionOverload' : {
+        'headerFile': 'TestBindingHeader.h',
+        'register': False,
+    },
+
     })
 
     if buildconfig.substs.get("MOZ_DEBUG", False):