Bug 1652960 - Remove unnecessary includes from Document.h. r=smaug

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

dom/base/Document.cpp

@@ -60,6 +60,7 @@
 #include "mozilla/Sprintf.h"
 
 #include "mozilla/Telemetry.h"
+#include "nsIApplicationCache.h"
 #include "nsIInlineSpellChecker.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
@@ -117,6 +118,7 @@
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ElementBinding.h"
 #include "mozilla/dom/Event.h"
+#include "mozilla/dom/FailedCertSecurityInfoBinding.h"
 #include "mozilla/dom/FeaturePolicy.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
 #include "mozilla/dom/HTMLAllCollection.h"
@@ -126,6 +128,7 @@
 #include "mozilla/dom/MediaStatusManager.h"
 #include "mozilla/dom/MutationObservers.h"
 #include "mozilla/dom/Navigator.h"
+#include "mozilla/dom/NetErrorInfoBinding.h"
 #include "mozilla/dom/Performance.h"
 #include "mozilla/dom/TreeOrderedArrayInlines.h"
 #include "mozilla/dom/ResizeObserver.h"
@@ -1196,6 +1199,19 @@ Document::FrameRequest::FrameRequest(FrameRequestCallback& aCallback,
                                      int32_t aHandle)
     : mCallback(&aCallback), mHandle(aHandle) {}
 
+Document::FrameRequest::~FrameRequest() = default;
+
+Document::PendingFrameStaticClone::~PendingFrameStaticClone() = default;
+
+struct Document::MetaViewportElementAndData {
+  RefPtr<HTMLMetaElement> mElement;
+  ViewportMetaData mData;
+
+  bool operator==(const MetaViewportElementAndData& aOther) const {
+    return mElement == aOther.mElement && mData == aOther.mData;
+  }
+};
+
 // ==================================================================
 // =
 // ==================================================================

dom/base/Document.h

@@ -13,13 +13,9 @@
 #include "nsCOMArray.h"           // for member
 #include "nsCompatibility.h"      // for member
 #include "nsCOMPtr.h"             // for member
-#include "nsICookieJarSettings.h"
-#include "nsGkAtoms.h"           // for static class members
-#include "nsNameSpaceManager.h"  // for static class members
-#include "nsIApplicationCache.h"
+#include "nsGkAtoms.h"            // for static class members
 #include "nsIApplicationCacheContainer.h"
 #include "nsIContentViewer.h"
-#include "nsIDOMXULCommandDispatcher.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
 #include "nsILoadGroup.h"  // for member (in nsCOMPtr)
@@ -29,17 +25,14 @@
 #include "nsIProgressEventSink.h"
 #include "nsIRadioGroupContainer.h"
 #include "nsIScriptObjectPrincipal.h"
-#include "nsIScriptGlobalObject.h"   // for member (in nsCOMPtr)
-#include "nsIURI.h"                  // for use in inline functions
-#include "nsIWebProgressListener.h"  // for nsIWebProgressListener
-#include "nsIWeakReferenceUtils.h"   // for nsWeakPtr
-#include "nsPIDOMWindow.h"           // for use in inline functions
-#include "nsPropertyTable.h"         // for member
+#include "nsIURI.h"                 // for use in inline functions
+#include "nsIWeakReferenceUtils.h"  // for nsWeakPtr
+#include "nsPIDOMWindow.h"          // for use in inline functions
+#include "nsPropertyTable.h"        // for member
 #include "nsStringFwd.h"
 #include "nsStubMutationObserver.h"
 #include "nsTHashtable.h"  // for member
 #include "nsURIHashKey.h"
-#include "mozilla/ServoBindingTypes.h"
 #include "mozilla/UseCounter.h"
 #include "mozilla/WeakPtr.h"
 #include "Units.h"
@@ -61,10 +54,13 @@
 #include "mozilla/SegmentedVector.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/UniquePtr.h"
-#include "mozilla/dom/FailedCertSecurityInfoBinding.h"
-#include "mozilla/dom/NetErrorInfoBinding.h"
 #include <bitset>  // for member
 
+// XXX We need to include this here to ensure that DefaultDeleter for Servo
+// types is specialized before the template is instantiated. Probably, this
+// should be included at some other place already that's generated by cbindgen.
+#include "mozilla/ServoStyleConsts.h"
+
 // windows.h #defines CreateEvent
 #ifdef CreateEvent
 #  undef CreateEvent
@@ -95,35 +91,28 @@ class nsHTMLCSSStyleSheet;
 class nsHTMLDocument;
 class nsHTMLStyleSheet;
 class nsGenericHTMLElement;
-class nsAtom;
 class nsIBFCacheEntry;
-class nsIChannel;
 class nsIContent;
-class nsIContentSecurityPolicy;
 class nsIContentSink;
 class nsIDocShell;
 class nsIDocShellTreeItem;
 class nsIDocumentEncoder;
 class nsIDocumentObserver;
+class nsIDOMXULCommandDispatcher;
 class nsIHTMLCollection;
 class nsILayoutHistoryState;
-class nsILoadContext;
 class nsIObjectLoadingContent;
-class nsIObserver;
-class nsIPrincipal;
 class nsIRequest;
 class nsIRunnable;
+class nsIScriptGlobalObject;
 class nsISecurityConsoleMessage;
-class nsIStreamListener;
 class nsIStructuredCloneContainer;
-class nsIURI;
 class nsIVariant;
 class nsViewManager;
 class nsPresContext;
 class nsRange;
 class nsSimpleContentList;
 class nsTextNode;
-class nsWindowSizes;
 class nsDOMCaretPosition;
 class nsViewportInfo;
 class nsIGlobalObject;
@@ -140,7 +129,6 @@ class StyleSheet;
 class EditorCommand;
 class Encoding;
 class ErrorResult;
-class EventStates;
 class EventListenerManager;
 class FullscreenExit;
 class FullscreenRequest;
@@ -175,7 +163,6 @@ class CDATASection;
 class Comment;
 class CSSImportRule;
 struct CustomElementDefinition;
-class DocGroup;
 class DocumentL10n;
 class DocumentFragment;
 class DocumentTimeline;
@@ -184,9 +171,8 @@ class DOMImplementation;
 class DOMIntersectionObserver;
 class DOMStringList;
 class Element;
-struct ElementCreationOptions;
 class Event;
-class EventTarget;
+struct FailedCertSecurityInfo;
 class FeaturePolicy;
 class FontFaceSet;
 class FrameRequestCallback;
@@ -200,7 +186,7 @@ struct LifecycleCallbackArgs;
 class Link;
 class Location;
 class MediaQueryList;
-class GlobalObject;
+struct NetErrorInfo;
 class NodeFilter;
 class NodeIterator;
 enum class OrientationType : uint8_t;
@@ -209,7 +195,6 @@ class Promise;
 class ScriptLoader;
 class Selection;
 class ServiceWorkerDescriptor;
-class StyleSheetList;
 class SVGDocument;
 class SVGElement;
 class SVGSVGElement;
@@ -224,9 +209,6 @@ class XPathNSResolver;
 class XPathResult;
 class BrowsingContext;
 
-template <typename>
-class Sequence;
-
 class nsDocumentOnStack;
 class nsUnblockOnloadEvent;
 
@@ -3002,6 +2984,7 @@ class Document : public nsINode,
 
   struct FrameRequest {
     FrameRequest(FrameRequestCallback& aCallback, int32_t aHandle);
+    ~FrameRequest();
 
     // Comparator operators to allow RemoveElementSorted with an
     // integer argument on arrays of FrameRequest
@@ -3912,6 +3895,11 @@ class Document : public nsINode,
   // The getter returns a direct reference to an internal array which is
   // manipulated from within printing code.
   struct PendingFrameStaticClone {
+    PendingFrameStaticClone() = default;
+    PendingFrameStaticClone(PendingFrameStaticClone&&) = default;
+    PendingFrameStaticClone& operator=(PendingFrameStaticClone&&) = default;
+    ~PendingFrameStaticClone();
+
     RefPtr<nsFrameLoaderOwner> mElement;
     RefPtr<nsFrameLoader> mStaticCloneOf;
   };
@@ -4968,14 +4956,7 @@ class Document : public nsINode,
   // 2)  We haven't had Destroy() called on us yet.
   nsCOMPtr<nsILayoutHistoryState> mLayoutHistoryState;
 
-  struct MetaViewportElementAndData {
-    RefPtr<HTMLMetaElement> mElement;
-    ViewportMetaData mData;
-
-    bool operator==(const MetaViewportElementAndData& aOther) const {
-      return mElement == aOther.mElement && mData == aOther.mData;
-    }
-  };
+  struct MetaViewportElementAndData;
   // An array of <meta name="viewport"> elements and their data.
   nsTArray<MetaViewportElementAndData> mMetaViewports;
 

dom/broadcastchannel/BroadcastChannel.cpp

@@ -26,6 +26,7 @@
 #include "nsContentUtils.h"
 
 #include "nsIBFCacheEntry.h"
+#include "nsICookieJarSettings.h"
 #include "mozilla/dom/Document.h"
 
 #ifdef XP_WIN

dom/ipc/BrowserParent.h

@@ -42,6 +42,7 @@ class nsIURI;
 class nsILoadContext;
 class nsIDocShell;
 class nsIWebBrowserPersistDocumentReceiver;
+class nsIWebProgress;
 
 namespace mozilla {
 

dom/offline/nsDOMOfflineResourceList.cpp

@@ -12,6 +12,7 @@
 #include "nsNetUtil.h"
 #include "nsNetCID.h"
 #include "nsServiceManagerUtils.h"
+#include "nsICookieJarSettings.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIOfflineCacheUpdate.h"
 #include "nsContentUtils.h"

dom/workers/RuntimeService.cpp

@@ -75,6 +75,10 @@
 #include "WorkerThread.h"
 #include "prsystem.h"
 
+#ifdef DEBUG
+#  include "nsICookieJarSettings.h"
+#endif
+
 #define WORKERS_SHUTDOWN_TOPIC "web-workers-shutdown"
 
 namespace mozilla {

dom/workers/ScriptLoader.cpp

@@ -12,6 +12,7 @@
 #include "nsIChannel.h"
 #include "nsIContentPolicy.h"
 #include "nsIContentSecurityPolicy.h"
+#include "nsICookieJarSettings.h"
 #include "nsIDocShell.h"
 #include "nsIHttpChannel.h"
 #include "nsIHttpChannelInternal.h"

dom/workers/WorkerLoadInfo.cpp

@@ -17,6 +17,7 @@
 #include "mozilla/StoragePrincipalHelper.h"
 #include "nsContentUtils.h"
 #include "nsIContentSecurityPolicy.h"
+#include "nsICookieJarSettings.h"
 #include "nsINetworkInterceptController.h"
 #include "nsIProtocolHandler.h"
 #include "nsIBrowserChild.h"

dom/xhr/XMLHttpRequestMainThread.cpp

@@ -252,6 +252,22 @@ XMLHttpRequestMainThread::~XMLHttpRequestMainThread() {
   mozilla::DropJSObjects(this);
 }
 
+void XMLHttpRequestMainThread::Construct(
+    nsIPrincipal* aPrincipal, nsICookieJarSettings* aCookieJarSettings,
+    bool aForWorker, nsIURI* aBaseURI /* = nullptr */,
+    nsILoadGroup* aLoadGroup /* = nullptr */,
+    PerformanceStorage* aPerformanceStorage /* = nullptr */,
+    nsICSPEventListener* aCSPEventListener /* = nullptr */) {
+  MOZ_ASSERT(aPrincipal);
+  mPrincipal = aPrincipal;
+  mBaseURI = aBaseURI;
+  mLoadGroup = aLoadGroup;
+  mCookieJarSettings = aCookieJarSettings;
+  mForWorker = aForWorker;
+  mPerformanceStorage = aPerformanceStorage;
+  mCSPEventListener = aCSPEventListener;
+}
+
 void XMLHttpRequestMainThread::InitParameters(bool aAnon, bool aSystem) {
   if (!aAnon && !aSystem) {
     return;

dom/xhr/XMLHttpRequestMainThread.h

@@ -217,16 +217,7 @@ class XMLHttpRequestMainThread final : public XMLHttpRequest,
                  nsICookieJarSettings* aCookieJarSettings, bool aForWorker,
                  nsIURI* aBaseURI = nullptr, nsILoadGroup* aLoadGroup = nullptr,
                  PerformanceStorage* aPerformanceStorage = nullptr,
-                 nsICSPEventListener* aCSPEventListener = nullptr) {
-    MOZ_ASSERT(aPrincipal);
-    mPrincipal = aPrincipal;
-    mBaseURI = aBaseURI;
-    mLoadGroup = aLoadGroup;
-    mCookieJarSettings = aCookieJarSettings;
-    mForWorker = aForWorker;
-    mPerformanceStorage = aPerformanceStorage;
-    mCSPEventListener = aCSPEventListener;
-  }
+                 nsICSPEventListener* aCSPEventListener = nullptr);
 
   void InitParameters(bool aAnon, bool aSystem);
 

layout/style/Loader.cpp

@@ -29,6 +29,7 @@
 #include "nsString.h"
 #include "nsIContent.h"
 #include "nsIContentInlines.h"
+#include "nsICookieJarSettings.h"
 #include "mozilla/dom/Document.h"
 #include "nsIURI.h"
 #include "nsNetUtil.h"

netwerk/cookie/CookieCommons.cpp

@@ -18,6 +18,7 @@
 #include "nsICookieService.h"
 #include "nsIEffectiveTLDService.h"
 #include "nsIRedirectHistoryEntry.h"
+#include "nsIWebProgressListener.h"
 #include "nsNetUtil.h"
 #include "nsScriptSecurityManager.h"
 

netwerk/cookie/CookieService.cpp

@@ -25,6 +25,7 @@
 #include "nsIScriptError.h"
 #include "nsIURL.h"
 #include "nsIURI.h"
+#include "nsIWebProgressListener.h"
 #include "nsNetUtil.h"
 #include "prprf.h"
 

netwerk/url-classifier/UrlClassifierFeatureTrackingAnnotation.cpp

@@ -12,6 +12,7 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/net/UrlClassifierCommon.h"
 #include "nsIClassifiedChannel.h"
+#include "nsIWebProgressListener.h"
 #include "nsContentUtils.h"
 
 namespace mozilla {