Backed out 9 changesets (bug 1817715, bug 1817721, bug 1817716, bug 1…

…817719, bug 1817720, bug 1817722, bug 1817718, bug 1817714, bug 1817717) for BP-hybrid bustages on PacketDumper.h. Backed out changeset b582db8692bb (bug 1817722) Backed out changeset f1d37a26a9ea (bug 1817721) Backed out changeset f0991bfb779c (bug 1817720) Backed out changeset 42c27b8d075b (bug 1817719) Backed out changeset 67f07f966ef3 (bug 1817718) Backed out changeset 408aa730ae68 (bug 1817717) Backed out changeset 708b5529e7da (bug 1817716) Backed out changeset f0a3ca660b68 (bug 1817715) Backed out changeset 36af23356e21 (bug 1817714)
iaxat · Feb 21, 2023 · c1f4368 · c1f4368
1 parent c13201b
commit c1f4368
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 10 deletions.
diff --git a/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp b/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
@@ -490,6 +490,14 @@ PeerConnectionImpl* PeerConnectionCtx::GetPeerConnection(
   return iterator->second;
 }
 
+template <typename Function>
+void PeerConnectionCtx::ForEachPeerConnection(Function&& aFunction) const {
+  MOZ_ASSERT(NS_IsMainThread());
+  for (const auto& pair : mPeerConnections) {
+    aFunction(pair.second);
+  }
+}
+
 void PeerConnectionCtx::ClearClosedStats() {
   for (auto& [id, pc] : mPeerConnections) {
     Unused << id;

diff --git a/dom/media/webrtc/jsapi/PeerConnectionCtx.h b/dom/media/webrtc/jsapi/PeerConnectionCtx.h
@@ -126,12 +126,7 @@ class PeerConnectionCtx {
                          PeerConnectionImpl* aPeerConnection);
   PeerConnectionImpl* GetPeerConnection(const std::string& aKey) const;
   template <typename Function>
-  void ForEachPeerConnection(Function&& aFunction) const {
-    MOZ_ASSERT(NS_IsMainThread());
-    for (const auto& pair : mPeerConnections) {
-      aFunction(pair.second);
-    }
-  }
+  void ForEachPeerConnection(Function&& aFunction) const;
 
   void ClearClosedStats();
 

diff --git a/dom/media/webrtc/jsapi/moz.build b/dom/media/webrtc/jsapi/moz.build
@@ -37,3 +37,5 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/dom/promise/PromiseNativeHandler.cpp b/dom/promise/PromiseNativeHandler.cpp
@@ -7,8 +7,6 @@
 #include "PromiseNativeHandler.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Promise.h"
-#include "mozilla/dom/DOMException.h"
-#include "mozilla/dom/DOMExceptionBinding.h"
 #include "nsISupportsImpl.h"
 
 namespace mozilla::dom {

diff --git a/dom/promise/moz.build b/dom/promise/moz.build
@@ -40,3 +40,5 @@ MOCHITEST_MANIFESTS += ["tests/mochitest.ini"]
 MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"]
 
 XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/intl/uconv/moz.build b/intl/uconv/moz.build
@@ -30,3 +30,5 @@ XPCOM_MANIFESTS += [
 ]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/security/sandbox/linux/gtest/moz.build b/security/sandbox/linux/gtest/moz.build
@@ -24,3 +24,5 @@ LOCAL_INCLUDES += [
 ]
 
 FINAL_LIBRARY = "xul-gtest"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/security/sandbox/linux/launch/moz.build b/security/sandbox/linux/launch/moz.build
@@ -31,3 +31,5 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build
@@ -35,3 +35,5 @@ FINAL_LIBRARY = "xul"
 
 with Files("**"):
     BUG_COMPONENT = ("Toolkit", "Autocomplete")
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/browser/moz.build b/toolkit/components/browser/moz.build
@@ -39,3 +39,5 @@ EXPORTS += [
     "nsEmbedCID.h",
     "nsWebBrowser.h",
 ]
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/find/moz.build b/toolkit/components/find/moz.build
@@ -27,3 +27,5 @@ SOURCES += [
 MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"]
 
 FINAL_LIBRARY = "xul"
+
+REQUIRES_UNIFIED_BUILD = True
diff --git a/toolkit/components/find/nsFind.cpp b/toolkit/components/find/nsFind.cpp
@@ -987,4 +987,6 @@ nsFind::Find(const nsAString& aPatText, nsRange* aSearchRange,
     DEBUG_FIND_PRINTF("NOT: %c == %c\n", c, patc);
     EndPartialMatch();
   }
+
+  return NS_OK;
 }
diff --git a/toolkit/components/find/nsWebBrowserFind.cpp b/toolkit/components/find/nsWebBrowserFind.cpp
@@ -43,7 +43,6 @@
 #  include "nsString.h"
 #endif
 
-using namespace mozilla;
 using mozilla::dom::Document;
 using mozilla::dom::Element;
 using mozilla::dom::Selection;

diff --git a/toolkit/components/find/nsWebBrowserFind.h b/toolkit/components/find/nsWebBrowserFind.h
@@ -11,7 +11,6 @@
 
 #include "nsCOMPtr.h"
 #include "nsIWeakReferenceUtils.h"
-#include "nsPIDOMWindow.h"
 
 #include "nsString.h"
 

diff --git a/toolkit/components/resistfingerprinting/moz.build b/toolkit/components/resistfingerprinting/moz.build
@@ -24,3 +24,5 @@ EXPORTS.mozilla += [
 EXTRA_JS_MODULES += [
     "RFPHelper.jsm",
 ]
+
+REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,5 @@ UNIFIED_SOURCES += [
		]

		FINAL_LIBRARY = "xul"

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,3 +40,5 @@ MOCHITEST_MANIFESTS += ["tests/mochitest.ini"]
		MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"]

		XPCSHELL_TESTS_MANIFESTS += ["tests/unit/xpcshell.ini"]

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

		FINAL_LIBRARY = "xul"

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

		FINAL_LIBRARY = "xul-gtest"

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,3 +31,5 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
		CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

		FINAL_LIBRARY = "xul"

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

		with Files("**"):
		BUG_COMPONENT = ("Toolkit", "Autocomplete")

		REQUIRES_UNIFIED_BUILD = True
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,5 @@ SOURCES += [
		MOCHITEST_MANIFESTS += ["test/mochitest/mochitest.ini"]

		FINAL_LIBRARY = "xul"

		REQUIRES_UNIFIED_BUILD = True