Bug 1730741 part 2: Add includes and forward-decls to fix non-unified…

…-build bustage in layout/base, and remove REQUIRES_UNIFIED_BUILD declaration. r=emilio After the fixes in this patch, the REQUIRES_UNIFIED_BUILD declaration is no longer needed, so I'm removing it here. This directory now builds successfully with that removed and with ac_add_options --disable-unified-build in the mozconfig. Differential Revision: https://phabricator.services.mozilla.com/D125601
dothq · Sep 15, 2021 · 3a3ace8 · 3a3ace8
1 parent 4aad1df
commit 3a3ace8
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 2 deletions.
diff --git a/layout/base/DisplayPortUtils.cpp b/layout/base/DisplayPortUtils.cpp
@@ -15,6 +15,7 @@
 #include "mozilla/layers/APZCCallbackHelper.h"
 #include "mozilla/layers/APZPublicUtils.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
+#include "mozilla/layers/LayersMessageUtils.h"
 #include "mozilla/layers/PAPZ.h"
 #include "mozilla/layers/RepaintRequest.h"
 #include "mozilla/PresShell.h"

diff --git a/layout/base/GeckoMVMContext.cpp b/layout/base/GeckoMVMContext.cpp
@@ -14,6 +14,7 @@
 #include "nsIDOMEventListener.h"
 #include "nsIFrame.h"
 #include "nsIObserverService.h"
+#include "nsIScrollableFrame.h"
 #include "nsLayoutUtils.h"
 #include "nsPIDOMWindow.h"
 #include "nsPresContext.h"

diff --git a/layout/base/MotionPathUtils.cpp b/layout/base/MotionPathUtils.cpp
@@ -13,6 +13,7 @@
 #include "mozilla/layers/LayersMessages.h"
 #include "mozilla/RefPtr.h"
 #include "nsIFrame.h"
+#include "nsLayoutUtils.h"
 #include "nsStyleTransformMatrix.h"
 
 #include <math.h>

diff --git a/layout/base/StaticPresData.cpp b/layout/base/StaticPresData.cpp
@@ -6,6 +6,7 @@
 
 #include "mozilla/StaticPresData.h"
 
+#include "gfxFontFeatures.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/ServoUtils.h"

diff --git a/layout/base/ZoomConstraintsClient.cpp b/layout/base/ZoomConstraintsClient.cpp
@@ -16,6 +16,7 @@
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/Event.h"
 #include "nsIFrame.h"
+#include "nsIScrollableFrame.h"
 #include "nsLayoutUtils.h"
 #include "nsPoint.h"
 #include "nsView.h"

diff --git a/layout/base/moz.build b/layout/base/moz.build
@@ -186,5 +186,3 @@ MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"]
 
 if CONFIG["CC_TYPE"] in ("clang", "gcc"):
     CXXFLAGS += ["-Wno-error=shadow"]
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/layout/base/nsCounterManager.cpp b/layout/base/nsCounterManager.cpp
@@ -15,6 +15,7 @@
 #include "mozilla/WritingModes.h"
 #include "nsContentUtils.h"
 #include "nsIContent.h"
+#include "nsIFrame.h"
 #include "nsTArray.h"
 #include "mozilla/dom/Text.h"
 

diff --git a/layout/base/nsFrameTraversal.cpp b/layout/base/nsFrameTraversal.cpp
@@ -11,6 +11,7 @@
 
 #include "nsFrameList.h"
 #include "nsPlaceholderFrame.h"
+#include "nsPresContext.h"
 #include "nsContainerFrame.h"
 
 using namespace mozilla;

diff --git a/layout/base/nsGenConList.cpp b/layout/base/nsGenConList.cpp
@@ -9,6 +9,7 @@
 #include "nsGenConList.h"
 #include "nsLayoutUtils.h"
 #include "nsIContent.h"
+#include "nsIFrame.h"
 
 void nsGenConNode::CheckFrameAssertions() {
   NS_ASSERTION(

diff --git a/layout/base/nsIFrameTraversal.h b/layout/base/nsIFrameTraversal.h
@@ -9,6 +9,7 @@
 #include "nsISupports.h"
 
 class nsIFrame;
+class nsPresContext;
 
 #define NS_IFRAMEENUMERATOR_IID                      \
   {                                                  \

diff --git a/layout/base/nsQuoteList.cpp b/layout/base/nsQuoteList.cpp
@@ -9,6 +9,7 @@
 #include "nsQuoteList.h"
 #include "nsReadableUtils.h"
 #include "nsIContent.h"
+#include "nsIFrame.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/Text.h"
 #include "mozilla/intl/Quotes.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -186,5 +186,3 @@ MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.ini"]

		if CONFIG["CC_TYPE"] in ("clang", "gcc"):
		CXXFLAGS += ["-Wno-error=shadow"]

		REQUIRES_UNIFIED_BUILD = True