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

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/interfaces/base/nsITextInputProcessor.idl      |  8 -----
 dom/interfaces/html/moz.build                      | 15 ----------
 dom/interfaces/html/nsIDOMMozBrowserFrame.idl      | 27 -----------------
 dom/interfaces/html/nsIMozBrowserFrame.idl         | 34 ----------------------
 .../payments/nsIPaymentActionResponse.idl          | 34 ----------------------
 dom/interfaces/payments/nsIPaymentAddress.idl      |  7 -----
 .../payments/nsIPaymentRequestService.idl          |  2 --
 dom/interfaces/payments/nsIPaymentUIService.idl    |  2 --
 dom/interfaces/push/nsIPushNotifier.idl            |  3 --
 9 files changed, 132 deletions(-)
 delete mode 100644 dom/interfaces/html/moz.build
 delete mode 100644 dom/interfaces/html/nsIDOMMozBrowserFrame.idl
 delete mode 100644 dom/interfaces/html/nsIMozBrowserFrame.idl

(limited to 'dom/interfaces')

diff --git a/dom/interfaces/base/nsITextInputProcessor.idl b/dom/interfaces/base/nsITextInputProcessor.idl
index 6d702af385..1dea6640bc 100644
--- a/dom/interfaces/base/nsITextInputProcessor.idl
+++ b/dom/interfaces/base/nsITextInputProcessor.idl
@@ -664,11 +664,3 @@ interface nsITextInputProcessor : nsISupports
                     in AString aKeyValue,
                     [optional] in jsval aLocation);
 };
-
-%{C++
-#define TEXT_INPUT_PROCESSOR_CID \
-  { 0xcaaab47f, 0x1e31, 0x478e, \
-    { 0x89, 0x19, 0x97, 0x09, 0x04, 0xe9, 0xcb, 0x72 } }
-#define TEXT_INPUT_PROCESSOR_CONTRACTID \
-  "@mozilla.org/text-input-processor;1"
-%}
diff --git a/dom/interfaces/html/moz.build b/dom/interfaces/html/moz.build
deleted file mode 100644
index 516bce30e2..0000000000
--- a/dom/interfaces/html/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
-
-XPIDL_SOURCES += [
-    "nsIDOMMozBrowserFrame.idl",
-    "nsIMozBrowserFrame.idl",
-]
-
-XPIDL_MODULE = "dom_html"
diff --git a/dom/interfaces/html/nsIDOMMozBrowserFrame.idl b/dom/interfaces/html/nsIDOMMozBrowserFrame.idl
deleted file mode 100644
index 5ca9a19e6a..0000000000
--- a/dom/interfaces/html/nsIDOMMozBrowserFrame.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set tw=80 expandtab softtabstop=2 ts=2 sw=2: */
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-[scriptable, builtinclass, uuid(4CAFE116-581B-4194-B0DE-7F02378FC51D)]
-interface nsIDOMMozBrowserFrame : nsISupports
-{
-  /**
-   * <iframe> element may have the mozbrowser attribute.
-   *
-   * The mozbrowser attribute has no effect unless the <iframe> element is
-   * contained in a document privileged to create browser frames.
-   *
-   * An <iframe> element in a privileged document with the mozbrowser attribute
-   * emits a variety of events when various things happen inside the frame.
-   *
-   * This will be documented eventually, but for more information at the moment,
-   * see dom/browser-element/BrowserElement{Child,Parent}.js.
-   *
-   */
-  [infallible] attribute boolean mozbrowser;
-};
diff --git a/dom/interfaces/html/nsIMozBrowserFrame.idl b/dom/interfaces/html/nsIMozBrowserFrame.idl
deleted file mode 100644
index aec4fdfbeb..0000000000
--- a/dom/interfaces/html/nsIMozBrowserFrame.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set tw=80 expandtab softtabstop=2 ts=2 sw=2: */
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIDOMMozBrowserFrame.idl"
-
-interface nsIRemoteTab;
-
-[scriptable, builtinclass, uuid(0c0a862c-1a47-43c0-ae9e-d51835e3e1a6)]
-interface nsIMozBrowserFrame : nsIDOMMozBrowserFrame
-{
-  /**
-   * Gets whether this frame really is a browser frame.
-   *
-   * In order to really be a browser frame, this frame's
-   * nsIDOMMozBrowserFrame::mozbrowser attribute must be true, and the frame
-   * may have to pass various security checks.
-   */
-  [infallible] readonly attribute boolean reallyIsBrowser;
-
-  /**
-   * Initialize the API, and add frame message listener that supports API
-   * invocations.
-   */
-  [noscript] void initializeBrowserAPI();
-
-  /**
-   * Notify frame scripts that support the API to destroy.
-   */
-  [noscript] void destroyBrowserFrameScripts();
-};
diff --git a/dom/interfaces/payments/nsIPaymentActionResponse.idl b/dom/interfaces/payments/nsIPaymentActionResponse.idl
index 36d5be3b94..7ff24c3b7f 100644
--- a/dom/interfaces/payments/nsIPaymentActionResponse.idl
+++ b/dom/interfaces/payments/nsIPaymentActionResponse.idl
@@ -364,43 +364,9 @@ interface nsIBasicCardChangeDetails : nsIMethodChangeDetails
 
 
 %{C++
-#define NS_GENERAL_RESPONSE_DATA_CID \
-  { 0xb986773e, 0x2b30, 0x4ed2, { 0xb8, 0xfe, 0x6a, 0x96, 0x63, 0x1c, 0x80, 0x00 } }
-#define NS_GENERAL_RESPONSE_DATA_CONTRACT_ID \
-  "@mozilla.org/dom/payments/general-response-data;1"
-
-#define NS_BASICCARD_RESPONSE_DATA_CID \
-  { 0x0d55a5e6, 0xd185, 0x44f0, { 0xb9, 0x92, 0xa8, 0xe1, 0x32, 0x1e, 0x4b, 0xce } }
-#define NS_BASICCARD_RESPONSE_DATA_CONTRACT_ID \
-  "@mozilla.org/dom/payments/basiccard-response-data;1"
-
-#define NS_PAYMENT_CANMAKE_ACTION_RESPONSE_CID \
-  { 0x52fc3f9f, 0xc0cb, 0x4874, { 0xb3, 0xd4, 0xee, 0x4b, 0x6e, 0x9c, 0xbe, 0x9c } }
 #define NS_PAYMENT_CANMAKE_ACTION_RESPONSE_CONTRACT_ID \
   "@mozilla.org/dom/payments/payment-canmake-action-response;1"
 
-#define NS_PAYMENT_SHOW_ACTION_RESPONSE_CID \
-  { 0x184385cb, 0x2d35, 0x4b99, { 0xa9, 0xa3, 0x7c, 0x78, 0x0b, 0xf6, 0x6b, 0x9b } }
 #define NS_PAYMENT_SHOW_ACTION_RESPONSE_CONTRACT_ID \
   "@mozilla.org/dom/payments/payment-show-action-response;1"
-
-#define NS_PAYMENT_ABORT_ACTION_RESPONSE_CID \
-  { 0x8c72bcdb, 0x0c37, 0x4786, { 0xa9, 0xe5, 0x51, 0x0a, 0xfa, 0x2f, 0x8e, 0xde } }
-#define NS_PAYMENT_ABORT_ACTION_RESPONSE_CONTRACT_ID \
-  "@mozilla.org/dom/payments/payment-abort-action-response;1"
-
-#define NS_PAYMENT_COMPLETE_ACTION_RESPONSE_CID \
-  { 0x62c01e69, 0x9ca4, 0x4060, { 0x99, 0xe4, 0xb9, 0x5f, 0x62, 0x8c, 0x8e, 0x6d } }
-#define NS_PAYMENT_COMPLETE_ACTION_RESPONSE_CONTRACT_ID \
-  "@mozilla.org/dom/payments/payment-complete-action-response;1"
-
-#define NS_GENERAL_CHANGE_DETAILS_CID \
-  { 0xe031267e, 0xbec8, 0x4f3c, { 0xb0, 0xb1, 0x39, 0x6b, 0x77, 0xca, 0x26, 0x0c } }
-#define NS_GENERAL_CHANGE_DETAILS_CONTRACT_ID \
-  "@mozilla.org/dom/payments/general-change-details;1"
-
-#define NS_BASICCARD_CHANGE_DETAILS_CID \
-  { 0x5296f79e, 0x15ea, 0x40c3, { 0x81, 0x96, 0x19, 0xcf, 0xa6, 0x4d, 0x32, 0x8c } }
-#define NS_BASICCARD_CHANGE_DETAILS_CONTRACT_ID \
-  "@mozilla.org/dom/payments/basiccard-change-details;1"
 %}
diff --git a/dom/interfaces/payments/nsIPaymentAddress.idl b/dom/interfaces/payments/nsIPaymentAddress.idl
index 7f9bf39e51..e3827c017c 100644
--- a/dom/interfaces/payments/nsIPaymentAddress.idl
+++ b/dom/interfaces/payments/nsIPaymentAddress.idl
@@ -34,10 +34,3 @@ interface nsIPaymentAddress : nsISupports
             in AString aRecipient,
             in AString aPhone);
 };
-
-%{C++
-#define NS_PAYMENT_ADDRESS_CID \
-  { 0x49a02241, 0x7e48, 0x477a, { 0x93, 0x45, 0x9f, 0x24, 0x69, 0x25, 0xdc, 0xb3 } }
-#define NS_PAYMENT_ADDRESS_CONTRACT_ID \
-  "@mozilla.org/dom/payments/payment-address;1"
-%}
diff --git a/dom/interfaces/payments/nsIPaymentRequestService.idl b/dom/interfaces/payments/nsIPaymentRequestService.idl
index 34c296df94..45d2a3685b 100644
--- a/dom/interfaces/payments/nsIPaymentRequestService.idl
+++ b/dom/interfaces/payments/nsIPaymentRequestService.idl
@@ -95,8 +95,6 @@ interface nsIPaymentRequestService : nsISupports
 };
 
 %{C++
-#define NS_PAYMENT_REQUEST_SERVICE_CID \
-  { 0xcccd665f, 0xedf3, 0x41fc, { 0xab, 0x9b, 0xfc, 0x55, 0xb3, 0x73, 0x40, 0xaa } }
 #define NS_PAYMENT_REQUEST_SERVICE_CONTRACT_ID \
   "@mozilla.org/dom/payments/payment-request-service;1"
 %}
diff --git a/dom/interfaces/payments/nsIPaymentUIService.idl b/dom/interfaces/payments/nsIPaymentUIService.idl
index 21b181d6a1..b5213d9868 100644
--- a/dom/interfaces/payments/nsIPaymentUIService.idl
+++ b/dom/interfaces/payments/nsIPaymentUIService.idl
@@ -78,8 +78,6 @@ interface nsIPaymentUIService : nsISupports
 };
 
 %{C++
-#define NS_PAYMENT_UI_SERVICE_CID \
-  { 0x01f8bd55, 0x9017, 0x438b, { 0x85, 0xec, 0x7c, 0x15, 0xd2, 0xb3, 0x5c, 0xdc } }
 #define NS_PAYMENT_UI_SERVICE_CONTRACT_ID \
   "@mozilla.org/dom/payments/payment-ui-service;1"
 %}
diff --git a/dom/interfaces/push/nsIPushNotifier.idl b/dom/interfaces/push/nsIPushNotifier.idl
index 1c3a582803..ded62832d6 100644
--- a/dom/interfaces/push/nsIPushNotifier.idl
+++ b/dom/interfaces/push/nsIPushNotifier.idl
@@ -6,9 +6,6 @@
 #include "nsISupports.idl"
 
 %{C++
-#define PUSHNOTIFIER_CONTRACTID \
-  "@mozilla.org/push/Notifier;1"
-
 // These constants are duplicated in `PushComponents.js`.
 #define OBSERVER_TOPIC_PUSH "push-message"
 #define OBSERVER_TOPIC_SUBSCRIPTION_CHANGE "push-subscription-change"
-- 
cgit v1.2.3