Bug 1678062 - Remove unnecessary includes. r=andi

Differential Revision: https://phabricator.services.mozilla.com/D97467 Depends on D96561
inscapist · Nov 23, 2020 · f9e5a83 · f9e5a83
1 parent 57f7f7a
commit f9e5a83
Show file tree

Hide file tree

Showing 302 changed files with 1,337 additions and 1,023 deletions.
diff --git a/accessible/aom/AccessibleNode.h b/accessible/aom/AccessibleNode.h
@@ -10,7 +10,6 @@
 #include "nsDataHashtable.h"
 #include "nsRefPtrHashtable.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DOMString.h"
 #include "mozilla/dom/Nullable.h"
@@ -19,6 +18,8 @@ class nsINode;
 
 namespace mozilla {
 
+class ErrorResult;
+
 namespace a11y {
 class Accessible;
 }

diff --git a/devtools/shared/heapsnapshot/DominatorTree.h b/devtools/shared/heapsnapshot/DominatorTree.h
@@ -8,12 +8,13 @@
 
 #include "mozilla/devtools/HeapSnapshot.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/RefCounted.h"
 #include "js/UbiNodeDominatorTree.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace devtools {
 
 class DominatorTree final : public nsISupports, public nsWrapperCache {

diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.h b/devtools/shared/heapsnapshot/HeapSnapshot.h
@@ -7,7 +7,6 @@
 #define mozilla_devtools_HeapSnapshot__
 
 #include "js/HashTable.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/devtools/DeserializedNode.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Nullable.h"
@@ -27,6 +26,8 @@
 #include "nsXPCOM.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace devtools {
 
 class DominatorTree;

diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
@@ -15,7 +15,6 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/Span.h"
 #include "mozilla/Tuple.h"
-#include "mozilla/WeakPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/FeaturePolicy.h"
 #include "mozilla/dom/LocationBase.h"

diff --git a/docshell/base/SyncedContext.h b/docshell/base/SyncedContext.h
@@ -7,12 +7,16 @@
 #ifndef mozilla_dom_SyncedContext_h
 #define mozilla_dom_SyncedContext_h
 
+#include <array>
+#include <type_traits>
+#include <utility>
+#include "mozilla/Attributes.h"
 #include "mozilla/EnumSet.h"
+#include "nsStringFwd.h"
+#include "nscore.h"
+
+// Referenced via macro definitions
 #include "mozilla/ErrorResult.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/RefPtr.h"
-#include "mozilla/Tuple.h"
-#include <utility>
 
 class PickleIterator;
 
@@ -31,6 +35,8 @@ struct IPDLParamTraits;
 namespace dom {
 class ContentParent;
 class ContentChild;
+template <typename T>
+class MaybeDiscarded;
 
 namespace syncedcontext {
 

diff --git a/docshell/base/WindowContext.h b/docshell/base/WindowContext.h
@@ -9,7 +9,6 @@
 
 #include "mozilla/PermissionDelegateHandler.h"
 #include "mozilla/Span.h"
-#include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/MaybeDiscarded.h"
 #include "mozilla/dom/SyncedContext.h"
 #include "mozilla/dom/UserActivation.h"
@@ -27,6 +26,7 @@ namespace dom {
 
 class WindowGlobalParent;
 class WindowGlobalInit;
+class BrowsingContext;
 class BrowsingContextGroup;
 
 #define MOZ_EACH_WC_FIELD(FIELD)                                       \

diff --git a/docshell/base/nsILoadContext.idl b/docshell/base/nsILoadContext.idl
@@ -14,7 +14,9 @@ webidl Element;
 
 %{C++
 #ifdef MOZILLA_INTERNAL_API
-#include "mozilla/BasePrincipal.h" // for OriginAttributes
+namespace mozilla {
+class OriginAttributes;
+}
 #endif
 %}
 

diff --git a/docshell/shistory/ChildSHistory.h b/docshell/shistory/ChildSHistory.h
@@ -21,9 +21,9 @@
 
 #include "nsCOMPtr.h"
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
 #include "nsThreadUtils.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/LinkedList.h"
 #include "nsID.h"
 

diff --git a/dom/abort/AbortController.h b/dom/abort/AbortController.h
@@ -8,14 +8,15 @@
 #define mozilla_dom_AbortController_h
 
 #include "mozilla/dom/BindingDeclarations.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class AbortSignal;

diff --git a/dom/animation/CSSPseudoElement.h b/dom/animation/CSSPseudoElement.h
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/RefPtr.h"
 #include "nsCSSPseudoElements.h"

diff --git a/dom/base/BodyConsumer.h b/dom/base/BodyConsumer.h
@@ -10,7 +10,6 @@
 #include "mozilla/dom/AbortSignal.h"
 #include "mozilla/dom/MutableBlobStorage.h"
 #include "nsIInputStreamPump.h"
-#include "nsNetUtil.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 

diff --git a/dom/base/BodyStream.h b/dom/base/BodyStream.h
@@ -15,14 +15,15 @@
 #include "nsISupportsImpl.h"
 #include "nsNetCID.h"
 #include "nsWeakReference.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Mutex.h"
 
 class nsIGlobalObject;
 
 class nsIInputStream;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BodyStream;

diff --git a/dom/base/BodyUtil.h b/dom/base/BodyUtil.h
@@ -10,11 +10,12 @@
 #include "nsString.h"
 #include "nsError.h"
 
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/FormData.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class BodyUtil final {

diff --git a/dom/base/ChromeUtils.cpp b/dom/base/ChromeUtils.cpp
@@ -13,28 +13,21 @@
 #include "WrapperFactory.h"
 
 #include "mozilla/Base64.h"
-#include "mozilla/BasePrincipal.h"
 #include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/IntentionalCrash.h"
 #include "mozilla/PerformanceMetricsCollector.h"
 #include "mozilla/PerfStats.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ProcInfo.h"
-#include "mozilla/RDDProcessManager.h"
 #include "mozilla/ResultExtensions.h"
 #include "mozilla/SharedStyleSheetCache.h"
 #include "mozilla/TimeStamp.h"
-#include "mozilla/dom/BrowsingContext.h"
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/IdleDeadline.h"
 #include "mozilla/dom/InProcessParent.h"
-#include "mozilla/dom/InProcessChild.h"
 #include "mozilla/dom/JSActorService.h"
-#include "mozilla/dom/MediaMetadata.h"
 #include "mozilla/dom/MediaSessionBinding.h"
 #include "mozilla/dom/PBrowserParent.h"
-#include "mozilla/dom/PWindowGlobalParent.h"
 #include "mozilla/dom/Performance.h"
 #include "mozilla/dom/PopupBlocker.h"
 #include "mozilla/dom/Promise.h"
@@ -43,12 +36,9 @@
 #include "mozilla/dom/WindowBinding.h"  // For IdleRequestCallback/Options
 #include "mozilla/dom/WindowGlobalParent.h"
 #include "mozilla/dom/WorkerPrivate.h"
-#include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
-#include "mozilla/net/SocketProcessHost.h"
 #include "IOActivityMonitor.h"
-#include "nsIOService.h"
 #include "nsThreadUtils.h"
 #include "mozJSComponentLoader.h"
 #include "GeckoProfiler.h"

diff --git a/dom/base/ChromeUtils.h b/dom/base/ChromeUtils.h
@@ -11,13 +11,14 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/ChromeUtilsBinding.h"
 #include "mozilla/dom/Exceptions.h"
-#include "mozilla/ErrorResult.h"
 #include "nsDOMNavigationTiming.h"  // for DOMHighResTimeStamp
 #include "nsIDOMProcessChild.h"
 #include "nsIDOMProcessParent.h"
 
 namespace mozilla {
 
+class ErrorResult;
+
 namespace devtools {
 class HeapSnapshot;
 }  // namespace devtools

diff --git a/dom/base/Crypto.cpp b/dom/base/Crypto.cpp
@@ -4,19 +4,15 @@
  * 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 "Crypto.h"
-#include "jsfriendapi.h"
+#include "js/ScalarType.h"
 #include "js/experimental/TypedData.h"  // JS_GetArrayBufferViewType
 #include "nsCOMPtr.h"
 #include "nsIRandomGenerator.h"
-#include "MainThreadUtils.h"
-#include "nsXULAppAPI.h"
 
-#include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/CryptoBinding.h"
+#include "mozilla/dom/SubtleCrypto.h"
 #include "nsServiceManagerUtils.h"
 
-using mozilla::dom::ContentChild;
-
 namespace mozilla::dom {
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Crypto)

diff --git a/dom/base/CustomElementRegistry.h b/dom/base/CustomElementRegistry.h
@@ -11,7 +11,6 @@
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/CycleCollectedJSContext.h"  // for MicroTaskRunnable
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/CustomElementRegistryBinding.h"
 #include "mozilla/dom/Document.h"
@@ -23,6 +22,8 @@
 #include "nsContentUtils.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 struct CustomElementData;

diff --git a/dom/base/DOMImplementation.h b/dom/base/DOMImplementation.h
@@ -10,7 +10,6 @@
 #include "nsWrapperCache.h"
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIScriptGlobalObject.h"
@@ -19,6 +18,8 @@
 #include "nsString.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class Document;
 class DocumentType;

diff --git a/dom/base/DOMParser.h b/dom/base/DOMParser.h
@@ -10,14 +10,15 @@
 #include "nsCOMPtr.h"
 #include "mozilla/dom/Document.h"
 #include "nsWrapperCache.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Span.h"
 #include "mozilla/dom/DOMParserBinding.h"
 #include "mozilla/dom/TypedArray.h"
 
 class nsIGlobalObject;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class DOMParser final : public nsISupports, public nsWrapperCache {

diff --git a/dom/base/FormData.h b/dom/base/FormData.h
@@ -8,7 +8,6 @@
 #define mozilla_dom_FormData_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/HTMLFormSubmission.h"
 #include "mozilla/dom/File.h"
@@ -17,6 +16,8 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class HTMLFormElement;

diff --git a/dom/base/IdleDeadline.h b/dom/base/IdleDeadline.h
@@ -9,7 +9,6 @@
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "nsCOMPtr.h"

diff --git a/dom/base/Location.h b/dom/base/Location.h
@@ -12,14 +12,13 @@
 #include "mozilla/dom/BrowsingContext.h"
 #include "mozilla/dom/LocationBase.h"
 #include "nsCycleCollectionParticipant.h"
-#include "nsIWeakReferenceUtils.h"
-#include "nsPIDOMWindow.h"
 #include "nsString.h"
 #include "nsWrapperCache.h"
 
 class nsIDocShell;
+class nsIPrincipal;
 class nsIURI;
-class nsDocShellLoadState;
+class nsPIDOMWindowInner;
 
 namespace mozilla {
 namespace dom {

diff --git a/dom/base/LocationBase.h b/dom/base/LocationBase.h
@@ -8,7 +8,6 @@
 #define mozilla_dom_LocationBase_h
 
 #include "mozilla/AlreadyAddRefed.h"
-#include "mozilla/ErrorResult.h"
 #include "nsStringFwd.h"
 
 class nsIDocShell;
@@ -17,6 +16,8 @@ class nsIURI;
 class nsDocShellLoadState;
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 class BrowsingContext;
 

diff --git a/dom/base/MozQueryInterface.h b/dom/base/MozQueryInterface.h
@@ -21,10 +21,11 @@
 
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/NonRefcountedDOMObject.h"
-#include "mozilla/ErrorResult.h"
 #include "nsID.h"
 
 namespace mozilla {
+class ErrorResult;
+
 namespace dom {
 
 class MozQueryInterface final : public NonRefcountedDOMObject {