Merging upstream version 126.0.

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

1 files changed, 42 insertions, 23 deletions

diff --git a/dom/bindings/test/TestBindingHeader.h b/dom/bindings/test/TestBindingHeader.h
index 77053d9ba6..2e8c496758 100644
--- a/dom/bindings/test/TestBindingHeader.h
+++ b/dom/bindings/test/TestBindingHeader.h
@@ -131,29 +131,6 @@ class TestInterface : public nsISupports, public nsWrapperCache {
       JS::Handle<JS::Value>, const Optional<JS::Handle<JSObject*>>&,
       const Optional<JS::Handle<JSObject*>>&, ErrorResult&);
 
-  static already_AddRefed<TestInterface> Test3(const GlobalObject&,
-                                               const LongOrStringAnyRecord&,
-                                               ErrorResult&);
-
-  static already_AddRefed<TestInterface> Test4(
-      const GlobalObject&, const Record<nsString, Record<nsString, JS::Value>>&,
-      ErrorResult&);
-
-  static already_AddRefed<TestInterface> Test5(
-      const GlobalObject&,
-      const Record<
-          nsString,
-          Sequence<Record<nsString,
-                          Record<nsString, Sequence<Sequence<JS::Value>>>>>>&,
-      ErrorResult&);
-
-  static already_AddRefed<TestInterface> Test6(
-      const GlobalObject&,
-      const Sequence<Record<
-          nsCString,
-          Sequence<Sequence<Record<nsCString, Record<nsString, JS::Value>>>>>>&,
-      ErrorResult&);
-
   // Integer types
   int8_t ReadonlyByte();
   int8_t WritableByte();
@@ -1394,6 +1371,48 @@ class TestInterface : public nsISupports, public nsWrapperCache {
   void PassString(OwningNonNull<nsAString>&) = delete;
 };
 
+class TestLegacyFactoryFunctionInterface : public nsISupports,
+                                           public nsWrapperCache {
+ public:
+  NS_DECL_ISUPPORTS
+
+  // We need a GetParentObject to make binding codegen happy
+  virtual nsISupports* GetParentObject();
+
+  // And now our actual WebIDL API
+  static already_AddRefed<TestLegacyFactoryFunctionInterface> Test3(
+      const GlobalObject&, const LongOrStringAnyRecord&, ErrorResult&);
+
+  static already_AddRefed<TestLegacyFactoryFunctionInterface> Test4(
+      const GlobalObject&, const Record<nsString, Record<nsString, JS::Value>>&,
+      ErrorResult&);
+};
+
+class TestLegacyFactoryFunctionInterface2 : public nsISupports,
+                                            public nsWrapperCache {
+ public:
+  NS_DECL_ISUPPORTS
+
+  // We need a GetParentObject to make binding codegen happy
+  virtual nsISupports* GetParentObject();
+
+  // And now our actual WebIDL API
+  static already_AddRefed<TestLegacyFactoryFunctionInterface2> Test5(
+      const GlobalObject&,
+      const Record<
+          nsString,
+          Sequence<Record<nsString,
+                          Record<nsString, Sequence<Sequence<JS::Value>>>>>>&,
+      ErrorResult&);
+
+  static already_AddRefed<TestLegacyFactoryFunctionInterface2> Test6(
+      const GlobalObject&,
+      const Sequence<Record<
+          nsCString,
+          Sequence<Sequence<Record<nsCString, Record<nsString, JS::Value>>>>>>&,
+      ErrorResult&);
+};
+
 class TestIndexedGetterInterface : public nsISupports, public nsWrapperCache {
  public:
   NS_DECL_ISUPPORTS