Merging upstream version 125.0.1.

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

5 files changed, 0 insertions, 119 deletions

diff --git a/layout/build/components.conf b/layout/build/components.conf
index 0239a7c85c..eb834a20a1 100644
--- a/layout/build/components.conf
+++ b/layout/build/components.conf
@@ -150,16 +150,6 @@ Classes = [
         'headers': ['nsStructuredCloneContainer.h'],
     },
     {
-        'js_name': 'DOMRequest',
-        'cid': '{3160e271-138d-4cc7-9d63-6429f16957c7}',
-        'contract_ids': ['@mozilla.org/dom/dom-request-service;1'],
-        'interfaces': ['nsIDOMRequestService'],
-        'singleton': True,
-        'type': 'mozilla::dom::DOMRequestService',
-        'headers': ['mozilla/dom/DOMRequest.h'],
-        'constructor': 'mozilla::dom::DOMRequestService::FactoryCreate',
-    },
-    {
         'js_name': 'domStorageManager',
         'cid': '{656db07c-aa80-49e4-bce8-e431baae697d}',
         'contract_ids': ['@mozilla.org/dom/localStorage-manager;1'],
diff --git a/layout/build/moz.build b/layout/build/moz.build
index b2059e396e..9135208edb 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -6,7 +6,6 @@
 
 EXPORTS += [
     "nsContentDLF.h",
-    "nsLayoutCID.h",
     "nsLayoutStatics.h",
 ]
 
diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp
index a9234099b0..fac598b68a 100644
--- a/layout/build/nsContentDLF.cpp
+++ b/layout/build/nsContentDLF.cpp
@@ -16,7 +16,6 @@
 #include "mozilla/dom/Document.h"
 #include "nsNodeInfoManager.h"
 #include "nsString.h"
-#include "nsContentCID.h"
 #include "nsNetUtil.h"
 #include "nsCRT.h"
 #include "nsIViewSourceChannel.h"
diff --git a/layout/build/nsLayoutCID.h b/layout/build/nsLayoutCID.h
deleted file mode 100644
index 9805225fd2..0000000000
--- a/layout/build/nsLayoutCID.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* 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/. */
-
-#ifndef nsLayoutCID_h__
-#define nsLayoutCID_h__
-
-// {1691E1F4-EE41-11d4-9885-00C04FA0CF4B}
-#define NS_FRAMETRAVERSAL_CID                       \
-  {                                                 \
-    0x1691e1f4, 0xee41, 0x11d4, {                   \
-      0x98, 0x85, 0x0, 0xc0, 0x4f, 0xa0, 0xcf, 0x4b \
-    }                                               \
-  }
-
-/* a6cf90f9-15b3-11d2-932e-00805f8add32 */
-#define NS_LAYOUT_DEBUGGER_CID                       \
-  {                                                  \
-    0xa6cf90f9, 0x15b3, 0x11d2, {                    \
-      0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 \
-    }                                                \
-  }
-
-// {2fe88332-31c6-4829-b247-a07d8a73e80f}
-#define NS_CANVASRENDERINGCONTEXTWEBGL_CID            \
-  {                                                   \
-    0x2fe88332, 0x31c6, 0x4829, {                     \
-      0xb2, 0x47, 0xa0, 0x7d, 0x8a, 0x7e, 0xe8, 0x0fe \
-    }                                                 \
-  }
-
-// {ae2793c0-2ba3-4adb-9c5e-c23525812c64}
-#define NS_SDBCONNECTION_CID                         \
-  {                                                  \
-    0xae2793c0, 0x2ba3, 0x4adb, {                    \
-      0x9c, 0x5e, 0xc2, 0x35, 0x25, 0x81, 0x2c, 0x64 \
-    }                                                \
-  }
-
-// {656DB07C-AA80-49e4-BCE8-E431BAAE697D}
-#define NS_DOMLOCALSTORAGEMANAGER_CID                \
-  {                                                  \
-    0x656db07c, 0xaa80, 0x49e4, {                    \
-      0xbc, 0xe8, 0xe4, 0x31, 0xba, 0xae, 0x69, 0x7d \
-    }                                                \
-  }
-
-// {93ad72a6-02cd-4716-9626-d47d5ec275ec}
-#define NS_DOMJSON_CID                               \
-  {                                                  \
-    0x93ad72a6, 0x02cd, 0x4716, {                    \
-      0x96, 0x26, 0xd4, 0x7d, 0x5e, 0xc2, 0x75, 0xec \
-    }                                                \
-  }
-
-// {CF7FD51F-ABA2-44C1-9FF0-11F7508EFCD4}
-#define NS_FOCUSMANAGER_CID                          \
-  {                                                  \
-    0xcf7fd51f, 0xaba2, 0x44c1, {                    \
-      0x9f, 0xf0, 0x11, 0xf7, 0x50, 0x8e, 0xfc, 0xd4 \
-    }                                                \
-  }
-
-// {3160e271-138d-4cc7-9d63-6429f16957c7}
-#define DOMREQUEST_SERVICE_CID                       \
-  {                                                  \
-    0x3160e271, 0x138d, 0x4cc7, {                    \
-      0x9d, 0x63, 0x64, 0x29, 0xf1, 0x69, 0x57, 0xc7 \
-    }                                                \
-  }
-
-// {5a75c25a-5e7e-4d90-8f7c-07eb15cc0aa8}
-#define QUOTAMANAGER_SERVICE_CID                     \
-  {                                                  \
-    0x5a75c25a, 0x5e7e, 0x4d90, {                    \
-      0x8f, 0x7c, 0x07, 0xeb, 0x15, 0xcc, 0x0a, 0xa8 \
-    }                                                \
-  }
-
-// {c74bde32-bcc7-4840-8430-c733351b212a}
-#define SERVICEWORKERMANAGER_CID                     \
-  {                                                  \
-    0xc74bde32, 0xbcc7, 0x4840, {                    \
-      0x84, 0x30, 0xc7, 0x33, 0x35, 0x1b, 0x21, 0x2a \
-    }                                                \
-  }
-
-// {69da374a-fda3-4a93-9fbc-d9304f66a7fe}
-#define STORAGEACTIVITYSERVICE_CID                   \
-  {                                                  \
-    0x69da374a, 0xfda3, 0x4a93, {                    \
-      0x9f, 0xbc, 0xd9, 0x30, 0x4f, 0x66, 0xa7, 0xfe \
-    }                                                \
-  }
-
-#define NOTIFICATIONTELEMETRYSERVICE_CID             \
-  {                                                  \
-    0x5995b782, 0x6a0e, 0x4066, {                    \
-      0xaa, 0xc5, 0x27, 0x6f, 0x0a, 0x9a, 0xd8, 0xcf \
-    }                                                \
-  }
-
-#endif /* nsLayoutCID_h__ */
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 542785f156..93a1c1a329 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -13,7 +13,6 @@
 #include "mozilla/ModuleUtils.h"
 #include "nsImageModule.h"
 #include "nsLayoutStatics.h"
-#include "nsContentCID.h"
 #include "nsContentDLF.h"
 #include "nsContentPolicyUtils.h"
 #include "nsDataDocumentContentPolicy.h"
@@ -27,7 +26,6 @@
 #include "nsPlainTextSerializer.h"
 #include "nsXMLContentSerializer.h"
 #include "nsXHTMLContentSerializer.h"
-#include "nsLayoutCID.h"
 #include "nsFocusManager.h"
 #include "ThirdPartyUtil.h"
 #include "gfxPlatform.h"