Bug 1725145 - header files fixes in the hybrid build env. r=valentin

Differential Revision: https://phabricator.services.mozilla.com/D122343

accessible/base/nsCoreUtils.cpp

@@ -31,7 +31,9 @@
 #include "nsComponentManagerUtils.h"
 
 #include "XULTreeElement.h"
+#include "nsIContentInlines.h"
 #include "nsTreeColumns.h"
+#include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLLabelElement.h"
 #include "mozilla/dom/MouseEventBinding.h"

accessible/base/nsTextEquivUtils.cpp

@@ -11,6 +11,7 @@
 #include "AccIterator.h"
 #include "nsCoreUtils.h"
 #include "mozilla/dom/Text.h"
+#include "nsIContentInlines.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/xpcom/xpcAccessibilityService.cpp

@@ -4,6 +4,8 @@
 
 #include "xpcAccessibilityService.h"
 
+#include "mozilla/dom/Document.h"
+
 #include "nsAccessiblePivot.h"
 #include "nsAccessibilityService.h"
 #include "Platform.h"

accessible/xul/XULMenuAccessible.cpp

@@ -13,6 +13,7 @@
 #include "States.h"
 #include "XULFormControlAccessible.h"
 
+#include "nsIContentInlines.h"
 #include "nsIDOMXULContainerElement.h"
 #include "nsIDOMXULSelectCntrlEl.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"

docshell/base/BrowsingContextWebProgress.cpp

@@ -4,6 +4,7 @@
 
 #include "BrowsingContextWebProgress.h"
 #include "mozilla/dom/CanonicalBrowsingContext.h"
+#include "mozilla/ErrorNames.h"
 #include "mozilla/Logging.h"
 #include "nsCOMPtr.h"
 #include "nsIWebProgressListener.h"

dom/base/nsAttrValueOrString.cpp

@@ -5,6 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsAttrValueOrString.h"
+#include "nsAttrValueInlines.h"
 
 const nsAString& nsAttrValueOrString::String() const {
   if (mStringPtr) {

dom/base/nsDOMMutationObserver.cpp

@@ -15,6 +15,8 @@
 #include "mozilla/dom/KeyframeEffect.h"
 #include "mozilla/dom/DocGroup.h"
 
+#include "mozilla/BasePrincipal.h"
+
 #include "nsContentUtils.h"
 #include "nsCSSPseudoElements.h"
 #include "nsError.h"

dom/base/nsJSEnvironment.cpp

@@ -52,6 +52,7 @@
 #include "WrapperFactory.h"
 #include "nsGlobalWindow.h"
 #include "mozilla/AutoRestore.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/SchedulerGroup.h"
 #include "mozilla/StaticPrefs_javascript.h"

dom/bindings/TypedArray.h

@@ -20,6 +20,7 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/SpiderMonkeyInterface.h"
 #include "nsWrapperCache.h"
+#include "nsWrapperCacheInlines.h"
 
 namespace mozilla {
 namespace dom {

dom/events/InputEvent.cpp

@@ -6,6 +6,7 @@
 
 #include "mozilla/dom/InputEvent.h"
 #include "mozilla/TextEvents.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "prtime.h"
 
 namespace mozilla::dom {

dom/events/PointerEventHandler.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "PointerEventHandler.h"
+#include "nsIContentInlines.h"
 #include "nsIFrame.h"
 #include "PointerEvent.h"
 #include "PointerLockManager.h"

dom/file/FileReader.cpp

@@ -18,6 +18,7 @@
 #include "mozilla/dom/FileReaderBinding.h"
 #include "mozilla/dom/ProgressEvent.h"
 #include "mozilla/dom/UnionTypes.h"
+#include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerRef.h"
 #include "mozilla/dom/WorkerScope.h"

dom/html/HTMLAllCollection.cpp

@@ -9,7 +9,6 @@
 #include "jsfriendapi.h"
 #include "mozilla/dom/HTMLAllCollectionBinding.h"
 #include "mozilla/dom/Nullable.h"
-#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "nsContentList.h"
 #include "nsGenericHTMLElement.h"

dom/html/HTMLAllCollection.h

@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_HTMLAllCollection_h
 #define mozilla_dom_HTMLAllCollection_h
 
-#include "js/RootingAPI.h"
+#include "mozilla/dom/Document.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsISupportsImpl.h"
 #include "nsRefPtrHashtable.h"

dom/html/HTMLButtonElement.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/dom/FormData.h"
 #include "mozilla/dom/HTMLButtonElementBinding.h"
 #include "nsAttrValueInlines.h"
+#include "nsIContentInlines.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"

dom/html/HTMLFormElement.cpp

@@ -54,6 +54,7 @@
 #include "nsIFormSubmitObserver.h"
 #include "nsIObserverService.h"
 #include "nsCategoryManagerUtils.h"
+#include "nsIContentInlines.h"
 #include "nsISimpleEnumerator.h"
 #include "nsRange.h"
 #include "nsIScriptError.h"

dom/html/HTMLTableElement.cpp

@@ -9,6 +9,7 @@
 #include "nsAttrValueInlines.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsMappedAttributes.h"
+#include "nsWrapperCacheInlines.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLCollectionBinding.h"
 #include "mozilla/dom/HTMLTableElementBinding.h"

dom/html/nsGenericHTMLElement.cpp

@@ -73,6 +73,7 @@
 #include "nsLayoutUtils.h"
 #include "mozAutoDocUpdate.h"
 #include "nsHtml5Module.h"
+#include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/ElementInlines.h"
 #include "HTMLFieldSetElement.h"
 #include "nsTextNode.h"

dom/ipc/BrowserParent.cpp

@@ -23,6 +23,7 @@
 #include "mozilla/dom/ContentProcessManager.h"
 #include "mozilla/dom/DataTransfer.h"
 #include "mozilla/dom/DataTransferItemList.h"
+#include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/indexedDB/ActorsParent.h"
 #include "mozilla/dom/PaymentRequestParent.h"

dom/media/systemservices/CamerasParent.cpp

@@ -10,6 +10,7 @@
 #include "VideoFrameUtils.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/Unused.h"
 #include "mozilla/Services.h"
 #include "mozilla/Logging.h"

dom/media/webrtc/jsapi/RTCStatsReport.h

@@ -21,6 +21,7 @@
 #include "mozilla/MozPromise.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/dom/RTCStatsReportBinding.h"  // RTCStatsCollection
+#include "mozilla/dom/ToJSValue.h"
 
 namespace mozilla {
 namespace dom {

dom/messagechannel/MessagePort.cpp

@@ -16,6 +16,7 @@
 #include "mozilla/dom/MessagePortBinding.h"
 #include "mozilla/dom/MessagePortChild.h"
 #include "mozilla/dom/PMessagePort.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/StructuredCloneTags.h"
 #include "mozilla/dom/WorkerCommon.h"

dom/network/UDPSocket.cpp

@@ -12,6 +12,7 @@
 #include "mozilla/dom/UDPMessageEvent.h"
 #include "mozilla/dom/UDPSocketBinding.h"
 #include "mozilla/dom/UnionTypes.h"
+#include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/net/DNS.h"
 #include "nsComponentManagerUtils.h"
 #include "nsContentUtils.h"

dom/performance/PerformanceObserver.cpp

@@ -12,6 +12,7 @@
 #include "mozilla/dom/PerformanceObserverBinding.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerScope.h"
+#include "mozilla/StaticPrefs_dom.h"
 #include "nsIScriptError.h"
 #include "nsPIDOMWindow.h"
 #include "nsQueryObject.h"

dom/script/ScriptTrace.cpp

@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "ScriptTrace.h"
-#include "mozilla/AsyncEventDispatcher.h"
-#include "mozilla/StaticPrefs_dom.h"
-
-namespace mozilla {
-namespace dom {
-namespace script {
-
-static nsresult TestingDispatchEvent(nsIScriptElement* aScriptElement,
-                                     const nsAString& aEventType) {
-  if (!StaticPrefs::dom_expose_test_interfaces()) {
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsINode> target(do_QueryInterface(aScriptElement));
-  if (!target) {
-    return NS_OK;
-  }
-
-  RefPtr<AsyncEventDispatcher> dispatcher = new AsyncEventDispatcher(
-      target, aEventType, CanBubble::eYes, ChromeOnlyDispatch::eNo);
-  return dispatcher->PostDOMEvent();
-}
-
-}  // namespace script
-}  // namespace dom
-}  // namespace mozilla

dom/script/ScriptTrace.h

@@ -9,6 +9,9 @@
 
 #include "ScriptLoader.h"
 
+#include "mozilla/AsyncEventDispatcher.h"
+#include "mozilla/StaticPrefs_dom.h"
+
 namespace mozilla {
 namespace dom {
 namespace script {
@@ -38,8 +41,20 @@ namespace script {
   PR_END_MACRO
 
 static nsresult TestingDispatchEvent(nsIScriptElement* aScriptElement,
-                                     const nsAString& aEventType);
+                                     const nsAString& aEventType) {
+  if (!StaticPrefs::dom_expose_test_interfaces()) {
+    return NS_OK;
+  }
 
+  nsCOMPtr<nsINode> target(do_QueryInterface(aScriptElement));
+  if (!target) {
+    return NS_OK;
+  }
+
+  RefPtr<AsyncEventDispatcher> dispatcher = new AsyncEventDispatcher(
+      target, aEventType, CanBubble::eYes, ChromeOnlyDispatch::eNo);
+  return dispatcher->PostDOMEvent();
+}
 }  // namespace script
 }  // namespace dom
 }  // namespace mozilla

dom/script/moz.build

@@ -40,7 +40,6 @@ UNIFIED_SOURCES += [
     "ScriptLoadHandler.cpp",
     "ScriptLoadRequest.cpp",
     "ScriptSettings.cpp",
-    "ScriptTrace.cpp",
 ]
 
 LOCAL_INCLUDES += [

dom/security/DOMSecurityMonitor.cpp

@@ -13,6 +13,7 @@
 #include "nsIURI.h"
 #include "nsJSUtils.h"
 
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/StaticPrefs_dom.h"
 
 /* static */

dom/serviceworkers/ServiceWorkerRegistrar.cpp

@@ -8,6 +8,7 @@
 #include "mozilla/dom/ServiceWorkerRegistrarTypes.h"
 #include "mozilla/dom/DOMException.h"
 #include "mozilla/net/MozURL.h"
+#include "mozilla/StaticPrefs_dom.h"
 
 #include "nsIEventTarget.h"
 #include "nsIInputStream.h"

dom/smil/SMILCSSValueType.cpp

@@ -13,6 +13,7 @@
 #include "nsCSSProps.h"
 #include "nsCSSValue.h"
 #include "nsDebug.h"
+#include "nsPresContextInlines.h"
 #include "nsPresContext.h"
 #include "nsString.h"
 #include "nsStyleUtil.h"

dom/xul/nsXULPopupListener.cpp

@@ -16,6 +16,7 @@
 #include "nsXULPopupManager.h"
 #include "nsIScriptContext.h"
 #include "mozilla/dom/Document.h"
+#include "mozilla/dom/DocumentInlines.h"
 #include "nsServiceManagerUtils.h"
 #include "nsLayoutUtils.h"
 #include "mozilla/ReflowInput.h"

extensions/spellcheck/hunspell/glue/hunspell_csutil.cxx

@@ -71,6 +71,10 @@
  */
 #include "hunspell_csutil.hxx"
 #include "mozilla/Encoding.h"
+#include "mozilla/Span.h"
+#include "mozilla/Tuple.h"
+
+#include "nsUnicharUtils.h"
 
 /* This is a copy of get_current_cs from the hunspell csutil.cxx file.
  */
@@ -84,7 +88,7 @@ struct cs_info* hunspell_get_current_cs(const std::string& es) {
     ccs[i].cupper = i;
   }
 
-  auto encoding = Encoding::ForLabelNoReplacement(es);
+  auto encoding = mozilla::Encoding::ForLabelNoReplacement(es);
   if (!encoding) {
     return ccs;
   }
@@ -104,32 +108,32 @@ struct cs_info* hunspell_get_current_cs(const std::string& es) {
       char16_t uni[2];
       char16_t uniCased;
       uint8_t destination[4];
-      auto src1 = Span(&source, 1);
-      auto dst1 = Span(uni);
-      auto src2 = Span(&uniCased, 1);
-      auto dst2 = Span(destination);
+      auto src1 = mozilla::Span(&source, 1);
+      auto dst1 = mozilla::Span(uni);
+      auto src2 = mozilla::Span(&uniCased, 1);
+      auto dst2 = mozilla::Span(destination);
 
       uint32_t result;
       size_t read;
       size_t written;
-      Tie(result, read, written) =
+      mozilla::Tie(result, read, written) =
           decoder->DecodeToUTF16WithoutReplacement(src1, dst1, true);
-      if (result != kInputEmpty || read != 1 || written != 1) {
+      if (result != mozilla::kInputEmpty || read != 1 || written != 1) {
         break;
       }
 
       uniCased = ToLowerCase(uni[0]);
-      Tie(result, read, written) =
+      mozilla::Tie(result, read, written) =
           encoder->EncodeFromUTF16WithoutReplacement(src2, dst2, true);
-      if (result != kInputEmpty || read != 1 || written != 1) {
+      if (result != mozilla::kInputEmpty || read != 1 || written != 1) {
         break;
       }
       lower = destination[0];
 
       uniCased = ToUpperCase(uni[0]);
-      Tie(result, read, written) =
+      mozilla::Tie(result, read, written) =
           encoder->EncodeFromUTF16WithoutReplacement(src2, dst2, true);
-      if (result != kInputEmpty || read != 1 || written != 1) {
+      if (result != mozilla::kInputEmpty || read != 1 || written != 1) {
         break;
       }
       upper = destination[0];

gfx/thebes/gfxUtils.cpp

@@ -14,6 +14,7 @@
 #include "gfxQuad.h"
 #include "imgIEncoder.h"
 #include "mozilla/Base64.h"
+#include "mozilla/StyleColorInlines.h"
 #include "mozilla/Components.h"
 #include "mozilla/dom/ImageEncoder.h"
 #include "mozilla/dom/WorkerPrivate.h"

gfx/vr/ipc/VRParent.cpp

@@ -116,7 +116,7 @@ void VRParent::ActorDestroy(ActorDestroyReason aWhy) {
 #ifndef NS_FREE_PERMANENT_DATA
   // No point in going through XPCOM shutdown because we don't keep persistent
   // state.
-  ProcessChild::QuickExit();
+  ipc::ProcessChild::QuickExit();
 #endif
 
 #if defined(XP_WIN)

gfx/ycbcr/scale_yuv_argb.cpp

@@ -19,6 +19,8 @@
 #include "libyuv/scale_row.h"
 #include "libyuv/video_common.h"
 
+#include "mozilla/gfx/Types.h"
+
 #ifdef __cplusplus
 namespace libyuv {
 extern "C" {