From d85572c1963f72e8bef2787d900e0a8ffd8e6728 Mon Sep 17 00:00:00 2001
From: Norisz Fay <nfay@mozilla.com>
Date: Sun, 19 Feb 2023 18:37:26 +0200
Subject: [PATCH] Backed out 11 changesets (bug 1817309, bug 1817315, bug
 1817313, bug 1817317, bug 1817310, bug 1817314, bug 1817308, bug 1817312, bug
 1817311, bug 1817316, bug 1817318) for causing build bustages on
 nss_secutil.h CLOSED TREE

Backed out changeset 288b4848b023 (bug 1817308)
Backed out changeset 6ac5107e1c81 (bug 1817309)
Backed out changeset 6f6e7a258930 (bug 1817310)
Backed out changeset 32cadd62fec3 (bug 1817311)
Backed out changeset 5bfcee2bfb8b (bug 1817312)
Backed out changeset bfd59ae03c4f (bug 1817313)
Backed out changeset 0080bdd6ab3f (bug 1817314)
Backed out changeset e1e81a3a933d (bug 1817315)
Backed out changeset 151d9b5d1883 (bug 1817316)
Backed out changeset 1b03cabc6e5a (bug 1817317)
Backed out changeset 52b44c5d4b08 (bug 1817318)
---
 dom/serializers/moz.build                   | 2 ++
 dom/serializers/nsDocumentEncoder.cpp       | 2 --
 intl/hyphenation/glue/moz.build             | 2 ++
 intl/hyphenation/glue/nsHyphenator.cpp      | 2 --
 js/xpconnect/wrappers/FilteringWrapper.cpp  | 6 ++----
 js/xpconnect/wrappers/WrapperFactory.cpp    | 7 -------
 js/xpconnect/wrappers/moz.build             | 4 +++-
 modules/libjar/zipwriter/moz.build          | 2 ++
 modules/libmar/sign/moz.build               | 2 ++
 security/manager/pki/moz.build              | 2 ++
 security/manager/pki/nsNSSDialogHelper.cpp  | 1 -
 security/manager/pki/nsNSSDialogs.cpp       | 1 -
 startupcache/StartupCacheInfo.cpp           | 2 --
 startupcache/moz.build                      | 2 ++
 toolkit/components/perfmonitoring/moz.build | 2 ++
 toolkit/components/printingui/ipc/moz.build | 2 ++
 toolkit/components/startup/moz.build        | 2 ++
 uriloader/preload/PreloaderBase.cpp         | 3 +--
 uriloader/preload/moz.build                 | 2 ++
 19 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/dom/serializers/moz.build b/dom/serializers/moz.build
index b0a0a35b6f2c2..79c820664d8a4 100644
--- a/dom/serializers/moz.build
+++ b/dom/serializers/moz.build
@@ -33,4 +33,6 @@ UNIFIED_SOURCES += [
 
 FINAL_LIBRARY = "xul"
 
+REQUIRES_UNIFIED_BUILD = True
+
 CRASHTEST_MANIFESTS += ["crashtests/crashtests.list"]
diff --git a/dom/serializers/nsDocumentEncoder.cpp b/dom/serializers/nsDocumentEncoder.cpp
index fd5cea1e842c4..3fbbb942546b2 100644
--- a/dom/serializers/nsDocumentEncoder.cpp
+++ b/dom/serializers/nsDocumentEncoder.cpp
@@ -17,8 +17,6 @@
 #include "nsCRT.h"
 #include "nsIContentSerializer.h"
 #include "nsIDocumentEncoder.h"
-#include "nsINode.h"
-#include "nsIContentInlines.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIOutputStream.h"
 #include "nsRange.h"
diff --git a/intl/hyphenation/glue/moz.build b/intl/hyphenation/glue/moz.build
index 306edca2ebc0d..6e700f762acea 100644
--- a/intl/hyphenation/glue/moz.build
+++ b/intl/hyphenation/glue/moz.build
@@ -20,3 +20,5 @@ FINAL_LIBRARY = "xul"
 
 if CONFIG["COMPILE_ENVIRONMENT"]:
     CbindgenHeader("mapped_hyph.h", inputs=["/third_party/rust/mapped_hyph"])
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/intl/hyphenation/glue/nsHyphenator.cpp b/intl/hyphenation/glue/nsHyphenator.cpp
index 129f30f9d550d..47b0964e49c33 100644
--- a/intl/hyphenation/glue/nsHyphenator.cpp
+++ b/intl/hyphenation/glue/nsHyphenator.cpp
@@ -6,7 +6,6 @@
 #include "nsHyphenator.h"
 
 #include "mozilla/dom/ContentChild.h"
-#include "mozilla/Omnijar.h"
 #include "nsContentUtils.h"
 #include "nsIChannel.h"
 #include "nsIFile.h"
@@ -17,7 +16,6 @@
 #include "nsNetUtil.h"
 #include "nsUnicodeProperties.h"
 #include "nsUTF8Utils.h"
-#include "nsZipArchive.h"
 
 #include "mapped_hyph.h"
 
diff --git a/js/xpconnect/wrappers/FilteringWrapper.cpp b/js/xpconnect/wrappers/FilteringWrapper.cpp
index f4812e04ba824..53c95c9591910 100644
--- a/js/xpconnect/wrappers/FilteringWrapper.cpp
+++ b/js/xpconnect/wrappers/FilteringWrapper.cpp
@@ -11,7 +11,6 @@
 #include "nsJSUtils.h"
 #include "mozilla/ErrorResult.h"
 #include "xpcpublic.h"
-#include "xpcprivate.h"
 
 #include "jsapi.h"
 #include "js/Symbol.h"
@@ -63,9 +62,8 @@ bool AppendCrossOriginWhitelistedPropNames(JSContext* cx,
     MOZ_ASSERT(!props[n].isSymbol(), "Unexpected existing symbol-name prop");
   }
 #endif
-  if (!props.reserve(
-          props.length() +
-          mozilla::ArrayLength(sCrossOriginWhitelistedSymbolCodes))) {
+  if (!props.reserve(props.length() +
+                     ArrayLength(sCrossOriginWhitelistedSymbolCodes))) {
     return false;
   }
 
diff --git a/js/xpconnect/wrappers/WrapperFactory.cpp b/js/xpconnect/wrappers/WrapperFactory.cpp
index 43d7776963b6e..0a90c9e448aa0 100644
--- a/js/xpconnect/wrappers/WrapperFactory.cpp
+++ b/js/xpconnect/wrappers/WrapperFactory.cpp
@@ -30,13 +30,6 @@ using namespace mozilla;
 
 namespace xpc {
 
-#ifndef MOZ_UNIFIED_BUILD
-extern template class FilteringWrapper<js::CrossCompartmentSecurityWrapper,
-                                       Opaque>;
-extern template class FilteringWrapper<js::CrossCompartmentSecurityWrapper,
-                                       OpaqueWithCall>;
-#endif
-
 // When chrome pulls a naked property across the membrane using
 // .wrappedJSObject, we want it to cross the membrane into the
 // chrome compartment without automatically being wrapped into an
diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build
index fcf07a01818cd..8d19a30cb694f 100644
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -16,7 +16,7 @@ UNIFIED_SOURCES += [
     "WrapperFactory.cpp",
 ]
 
-# XrayWrapper needs to be built separately because of template instantiations.
+# XrayWrapper needs to be built separately becaue of template instantiations.
 SOURCES += [
     "XrayWrapper.cpp",
 ]
@@ -30,3 +30,5 @@ LOCAL_INCLUDES += [
     "../src",
     "/caps",
 ]
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/modules/libjar/zipwriter/moz.build b/modules/libjar/zipwriter/moz.build
index 4d94522536313..58d9b1d81d241 100644
--- a/modules/libjar/zipwriter/moz.build
+++ b/modules/libjar/zipwriter/moz.build
@@ -25,3 +25,5 @@ XPCOM_MANIFESTS += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/modules/libmar/sign/moz.build b/modules/libmar/sign/moz.build
index 92f0d6cefd33b..f280e50381081 100644
--- a/modules/libmar/sign/moz.build
+++ b/modules/libmar/sign/moz.build
@@ -28,3 +28,5 @@ c11_flags = ["-std=gnu11"]
 if CONFIG["CC_TYPE"] == "clang-cl":
     c11_flags.insert(0, "-Xclang")
 CFLAGS += c11_flags
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/security/manager/pki/moz.build b/security/manager/pki/moz.build
index 5f0bf9573874c..73d3d09eba453 100644
--- a/security/manager/pki/moz.build
+++ b/security/manager/pki/moz.build
@@ -32,3 +32,5 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
     CXXFLAGS += [
         "-Wno-unused-parameter",
     ]
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/security/manager/pki/nsNSSDialogHelper.cpp b/security/manager/pki/nsNSSDialogHelper.cpp
index 18691aa6e9722..4b204af85d1fc 100644
--- a/security/manager/pki/nsNSSDialogHelper.cpp
+++ b/security/manager/pki/nsNSSDialogHelper.cpp
@@ -6,7 +6,6 @@
 
 #include "nsNSSDialogHelper.h"
 
-#include "mozIDOMWindow.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "nsCOMPtr.h"
 #include "nsIWindowWatcher.h"
diff --git a/security/manager/pki/nsNSSDialogs.cpp b/security/manager/pki/nsNSSDialogs.cpp
index b1c1a939d5c50..54705052daaff 100644
--- a/security/manager/pki/nsNSSDialogs.cpp
+++ b/security/manager/pki/nsNSSDialogs.cpp
@@ -25,7 +25,6 @@
 #include "nsIX509Cert.h"
 #include "nsNSSDialogHelper.h"
 #include "nsPromiseFlatString.h"
-#include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsVariant.h"
 
diff --git a/startupcache/StartupCacheInfo.cpp b/startupcache/StartupCacheInfo.cpp
index 184fa1f42f923..461948d9c2f29 100644
--- a/startupcache/StartupCacheInfo.cpp
+++ b/startupcache/StartupCacheInfo.cpp
@@ -3,12 +3,10 @@
  * 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 "StartupCache.h"
 #include "StartupCacheInfo.h"
 
 #include "mozilla/Components.h"
 #include "mozilla/RefPtr.h"
-#include "mozilla/StaticPtr.h"
 
 using namespace mozilla;
 using namespace mozilla::scache;
diff --git a/startupcache/moz.build b/startupcache/moz.build
index a05aebd472995..4ee94be455ee4 100644
--- a/startupcache/moz.build
+++ b/startupcache/moz.build
@@ -32,3 +32,5 @@ XPIDL_SOURCES += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/perfmonitoring/moz.build b/toolkit/components/perfmonitoring/moz.build
index 193e5df7db208..ca0936822255c 100644
--- a/toolkit/components/perfmonitoring/moz.build
+++ b/toolkit/components/perfmonitoring/moz.build
@@ -21,3 +21,5 @@ LOCAL_INCLUDES += ["/dom/base"]
 FINAL_LIBRARY = "xul"
 
 include("/ipc/chromium/chromium-config.mozbuild")
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/printingui/ipc/moz.build b/toolkit/components/printingui/ipc/moz.build
index 99ff60c0e6814..a2aaeae1e5327 100644
--- a/toolkit/components/printingui/ipc/moz.build
+++ b/toolkit/components/printingui/ipc/moz.build
@@ -11,3 +11,5 @@ IPDL_SOURCES += [
 include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build
index 4127f90e676e4..c60737f3e840b 100644
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -22,3 +22,5 @@ FINAL_LIBRARY = "xul"
 
 with Files("**"):
     BUG_COMPONENT = ("Toolkit", "Startup and Profile System")
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/uriloader/preload/PreloaderBase.cpp b/uriloader/preload/PreloaderBase.cpp
index d61694e38139c..0ad46dc47167b 100644
--- a/uriloader/preload/PreloaderBase.cpp
+++ b/uriloader/preload/PreloaderBase.cpp
@@ -8,11 +8,10 @@
 #include "mozilla/Telemetry.h"
 #include "nsContentUtils.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
-#include "nsIHttpChannel.h"
+#include "nsIChannel.h"
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIRedirectResultListener.h"
-#include "nsNetUtil.h"
 
 // Change this if we want to cancel and remove the associated preload on removal
 // of all <link rel=preload> tags from the tree.
diff --git a/uriloader/preload/moz.build b/uriloader/preload/moz.build
index 27a2f8cf0019e..39bf8447818d3 100644
--- a/uriloader/preload/moz.build
+++ b/uriloader/preload/moz.build
@@ -24,3 +24,5 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
-- 
GitLab