From aac5ac29dcbe1aa1f9a49c9274c143507d25f828 Mon Sep 17 00:00:00 2001
From: Andi-Bogdan Postelnicu <bpostelnicu@mozilla.com>
Date: Tue, 17 Nov 2020 09:28:10 +0000
Subject: [PATCH] Bug 1626555 - Add `dom/xul` to the list of
 non-unified-build-compatible directories. r=sg

Differential Revision: https://phabricator.services.mozilla.com/D97197
---
 build/non-unified-compat      | 3 ++-
 dom/xul/XULPersist.cpp        | 1 +
 dom/xul/XULPersist.h          | 2 ++
 dom/xul/XULTooltipElement.cpp | 2 ++
 dom/xul/XULTooltipElement.h   | 2 +-
 dom/xul/nsXULContentSink.cpp  | 2 ++
 dom/xul/nsXULContentUtils.cpp | 3 ++-
 dom/xul/nsXULElement.cpp      | 6 ++++++
 8 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/build/non-unified-compat b/build/non-unified-compat
index 6034d61962d9..77aa52124318 100644
--- a/build/non-unified-compat
+++ b/build/non-unified-compat
@@ -72,4 +72,5 @@ dom/workers/
 dom/worklet/
 dom/xhr/
 dom/xml/
-dom/xslt/
\ No newline at end of file
+dom/xslt/
+dom/xul/
\ No newline at end of file
diff --git a/dom/xul/XULPersist.cpp b/dom/xul/XULPersist.cpp
index 232dc146e6db..4e45fc9e25fb 100644
--- a/dom/xul/XULPersist.cpp
+++ b/dom/xul/XULPersist.cpp
@@ -13,6 +13,7 @@
 #  include "nsIStringEnumerator.h"
 #endif
 #include "mozilla/BasePrincipal.h"
+#include "mozilla/dom/Element.h"
 #include "nsIAppWindow.h"
 
 namespace mozilla {
diff --git a/dom/xul/XULPersist.h b/dom/xul/XULPersist.h
index 9c74968812ec..07929584a1d8 100644
--- a/dom/xul/XULPersist.h
+++ b/dom/xul/XULPersist.h
@@ -7,6 +7,8 @@
 #ifndef mozilla_dom_XULPersist_h
 #define mozilla_dom_XULPersist_h
 
+#include "nsStubDocumentObserver.h"
+
 #ifndef MOZ_NEW_XULSTORE
 class nsIXULStore;
 #endif
diff --git a/dom/xul/XULTooltipElement.cpp b/dom/xul/XULTooltipElement.cpp
index 5669fe76fbb2..e418db165d5c 100644
--- a/dom/xul/XULTooltipElement.cpp
+++ b/dom/xul/XULTooltipElement.cpp
@@ -8,6 +8,8 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/XULTooltipElement.h"
 #include "mozilla/dom/NodeInfo.h"
+#include "mozilla/EventDispatcher.h"
+#include "nsContentCreatorFunctions.h"
 #include "nsCTooltipTextProvider.h"
 #include "nsITooltipTextProvider.h"
 
diff --git a/dom/xul/XULTooltipElement.h b/dom/xul/XULTooltipElement.h
index 3923abd6c059..7dffebffe078 100644
--- a/dom/xul/XULTooltipElement.h
+++ b/dom/xul/XULTooltipElement.h
@@ -12,7 +12,7 @@
 namespace mozilla {
 namespace dom {
 
-nsXULElement* NS_NewXULPopupElement(
+nsXULElement* NS_NewXULTooltipElement(
     already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 class XULTooltipElement final : public XULPopupElement {
diff --git a/dom/xul/nsXULContentSink.cpp b/dom/xul/nsXULContentSink.cpp
index 05f06b13e509..53342625b25a 100644
--- a/dom/xul/nsXULContentSink.cpp
+++ b/dom/xul/nsXULContentSink.cpp
@@ -49,6 +49,8 @@
 
 static mozilla::LazyLogModule gContentSinkLog("nsXULContentSink");
 
+using namespace mozilla;
+using namespace mozilla::dom;
 //----------------------------------------------------------------------
 
 XULContentSinkImpl::ContextStack::ContextStack() : mTop(nullptr), mDepth(0) {}
diff --git a/dom/xul/nsXULContentUtils.cpp b/dom/xul/nsXULContentUtils.cpp
index bd4a5a9bfd57..83af1e9bd84e 100644
--- a/dom/xul/nsXULContentUtils.cpp
+++ b/dom/xul/nsXULContentUtils.cpp
@@ -17,6 +17,7 @@
 #include "nsIContent.h"
 #include "nsICollation.h"
 #include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
 #include "nsXULContentUtils.h"
 #include "nsLayoutCID.h"
 #include "nsString.h"
@@ -57,7 +58,7 @@ nsICollation* nsXULContentUtils::GetCollation() {
 
 nsresult nsXULContentUtils::FindChildByTag(nsIContent* aElement,
                                            int32_t aNameSpaceID, nsAtom* aTag,
-                                           Element** aResult) {
+                                           mozilla::dom::Element** aResult) {
   for (nsIContent* child = aElement->GetFirstChild(); child;
        child = child->GetNextSibling()) {
     if (child->IsElement() && child->NodeInfo()->Equals(aTag, aNameSpaceID)) {
diff --git a/dom/xul/nsXULElement.cpp b/dom/xul/nsXULElement.cpp
index 52164bf3ad27..19c03fdf9a7d 100644
--- a/dom/xul/nsXULElement.cpp
+++ b/dom/xul/nsXULElement.cpp
@@ -15,6 +15,7 @@
 #include "mozilla/dom/BindContext.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/CSSRuleBinding.h"
+#include "mozilla/dom/XULTextElement.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/EventListenerManager.h"
 #include "mozilla/EventStateManager.h"
@@ -65,6 +66,10 @@
 #include "mozilla/EventDispatcher.h"
 #include "mozAutoDocUpdate.h"
 #include "nsCCUncollectableMarker.h"
+#include "nsContentCreatorFunctions.h"
+#include "nsMenuFrame.h"
+#include "nsMenuPopupFrame.h"
+#include "nsTextFrame.h"
 #include "nsICSSDeclaration.h"
 #include "nsLayoutUtils.h"
 #include "XULFrameElement.h"
@@ -76,6 +81,7 @@
 #include "mozilla/dom/nsCSPUtils.h"
 #include "mozilla/dom/XULElementBinding.h"
 #include "mozilla/dom/XULBroadcastManager.h"
+#include "mozilla/dom/XULTooltipElement.h"
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/MutationEventBinding.h"
 #include "mozilla/dom/XULCommandEvent.h"