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)
iaxat · Feb 19, 2023 · 4e8619d · 4e8619d
1 parent 9ad66f9
commit 4e8619d
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,3 +24,5 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,6 @@ UNIFIED_SOURCES += [

		FINAL_LIBRARY = "xul"

		REQUIRES_UNIFIED_BUILD = True

		CRASHTEST_MANIFESTS += ["crashtests/crashtests.list"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,3 +25,5 @@ XPCOM_MANIFESTS += [
		]

		FINAL_LIBRARY = "xul"

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,3 +32,5 @@ XPIDL_SOURCES += [
		]

		FINAL_LIBRARY = "xul"

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,5 @@ LOCAL_INCLUDES += ["/dom/base"]
		FINAL_LIBRARY = "xul"

		include("/ipc/chromium/chromium-config.mozbuild")

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,5 @@ IPDL_SOURCES += [
		include("/ipc/chromium/chromium-config.mozbuild")

		FINAL_LIBRARY = "xul"

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,5 @@ FINAL_LIBRARY = "xul"

		with Files("**"):
		BUG_COMPONENT = ("Toolkit", "Startup and Profile System")

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,5 @@ UNIFIED_SOURCES += [
		]

		FINAL_LIBRARY = "xul"

		REQUIRES_UNIFIED_BUILD = True