Bug 1053190 - Reduce unnecessary inclusion of nsINode.h in headers; r=ehsan

accessible/base/nsCoreUtils.h

@@ -7,7 +7,7 @@
 #define nsCoreUtils_h_
 
 #include "nsIContent.h"
-#include "nsIDocument.h"
+#include "nsIDocument.h" // for GetShell()
 #include "nsIPresShell.h"
 
 #include "nsPoint.h"

content/base/public/nsCopySupport.h

@@ -7,8 +7,8 @@
 #define nsCopySupport_h__
 
 #include "nscore.h"
-#include "nsINode.h"
 
+class nsINode;
 class nsISelection;
 class nsIDocument;
 class nsIImageLoadingContent;

content/base/public/nsINodeList.h

@@ -8,7 +8,9 @@
 
 #include "nsIDOMNodeList.h"
 #include "nsWrapperCache.h"
-#include "nsIContent.h"
+
+class nsIContent;
+class nsINode;
 
 // IID for the nsINodeList interface
 #define NS_INODELIST_IID \

content/base/src/Attr.h

@@ -19,7 +19,8 @@
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsStubMutationObserver.h"
-#include "nsIDocument.h"
+
+class nsIDocument;
 
 namespace mozilla {
 class EventChainPreVisitor;

content/base/src/ChildIterator.h

@@ -18,7 +18,10 @@
  * binding's <xbl:content> element.
  */
 
-#include "nsIContent.h"
+#include <stdint.h>
+#include "nsAutoPtr.h"
+
+class nsIContent;
 
 namespace mozilla {
 namespace dom {

content/base/src/Link.h

@@ -14,7 +14,7 @@
 #include "mozilla/IHistory.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/URLSearchParams.h"
-#include "nsIContent.h"
+#include "nsIContent.h" // for nsLinkState
 
 namespace mozilla {
 

content/base/src/nsContentList.h

@@ -27,6 +27,7 @@
 #include "nsWrapperCache.h"
 #include "nsHashKeys.h"
 #include "mozilla/HashFunctions.h"
+#include "mozilla/dom/NameSpaceConstants.h"
 
 namespace mozilla {
 namespace dom {

content/base/src/nsElementFrameLoaderOwner.cpp

@@ -17,6 +17,8 @@
 #include "mozIApplication.h"
 #include "nsIPermissionManager.h"
 #include "GeckoProfiler.h"
+#include "nsIDocument.h"
+#include "nsPIDOMWindow.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/base/src/nsGenericDOMDataNode.h

@@ -20,9 +20,9 @@
 #include "nsCycleCollectionParticipant.h"
 
 #include "nsISMILAttr.h"
-#include "nsIDocument.h"
 #include "mozilla/dom/ShadowRoot.h"
 
+class nsIDocument;
 class nsIDOMAttr;
 class nsIDOMEventListener;
 class nsIDOMNodeList;

content/base/src/nsTraversal.h

@@ -12,7 +12,7 @@
 #define nsTraversal_h___
 
 #include "nsCOMPtr.h"
-#include "nsIDocument.h"
+#include "nsIDocument.h" // for NodeFilterHolder
 #include "mozilla/dom/CallbackObject.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/NodeFilterBinding.h"

content/base/src/nsXMLHttpRequest.h

@@ -14,7 +14,6 @@
 #include "nsIURI.h"
 #include "nsIHttpChannel.h"
 #include "nsIDocument.h"
-#include "nsIContent.h"
 #include "nsIStreamListener.h"
 #include "nsWeakReference.h"
 #include "nsIChannelEventSink.h"

content/html/content/src/HTMLTrackElement.h

@@ -12,12 +12,13 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
-#include "nsIContent.h"
-#include "nsIDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIHttpChannel.h"
 
+class nsIContent;
+class nsIDocument;
+
 namespace mozilla {
 namespace dom {
 

content/svg/content/src/SVGIFrameElement.h

@@ -10,7 +10,6 @@
 #include "nsDOMSettableTokenList.h"
 #include "nsFrameLoader.h"
 #include "nsElementFrameLoaderOwner.h"
-#include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMEventListener.h"
 #include "nsIFrameLoader.h"
@@ -25,6 +24,7 @@ nsresult NS_NewSVGIFrameElement(nsIContent **aResult,
 
 typedef mozilla::dom::SVGGraphicsElement SVGIFrameElementBase;
 
+class nsIDocument;
 class nsSVGIFrameFrame;
 
 namespace mozilla {

content/svg/content/src/SVGIRect.h

@@ -11,8 +11,8 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
 #include "nsWrapperCache.h"
-#include "nsIContent.h"
 
+class nsIContent;
 class nsSVGElement;
 
 namespace mozilla {

dom/events/AsyncEventDispatcher.h

@@ -10,10 +10,11 @@
 #include "nsCOMPtr.h"
 #include "nsIDocument.h"
 #include "nsIDOMEvent.h"
-#include "nsINode.h"
 #include "nsString.h"
 #include "nsThreadUtils.h"
 
+class nsINode;
+
 namespace mozilla {
 
 /**

dom/nfc/MozNDEFRecord.h

@@ -15,11 +15,10 @@
 #include "nsWrapperCache.h"
 #include "jsapi.h"
 
-#include "nsIDocument.h"
-
 #include "mozilla/dom/TypedArray.h"
 #include "jsfriendapi.h"
 #include "js/GCAPI.h"
+#include "nsPIDOMWindow.h"
 
 struct JSContext;
 

dom/src/notification/DesktopNotification.h

@@ -17,7 +17,6 @@
 #include "nsIScriptObjectPrincipal.h"
 
 #include "nsIDOMEvent.h"
-#include "nsIDocument.h"
 
 #include "mozilla/Attributes.h"
 #include "mozilla/DOMEventTargetHelper.h"

gfx/layers/apz/util/APZCCallbackHelper.cpp

@@ -10,6 +10,9 @@
 #include "nsLayoutUtils.h"
 #include "nsIDOMElement.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "nsIContent.h"
+#include "nsIDocument.h"
+#include "nsIDOMWindow.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/apz/util/APZCCallbackHelper.h

@@ -7,10 +7,12 @@
 #define mozilla_layers_APZCCallbackHelper_h
 
 #include "FrameMetrics.h"
-#include "nsIContent.h"
-#include "nsIDocument.h"
 #include "nsIDOMWindowUtils.h"
 
+class nsIContent;
+class nsIDocument;
+template<class T> struct already_AddRefed;
+
 namespace mozilla {
 namespace layers {
 

gfx/layers/apz/util/ActiveElementManager.cpp

@@ -11,6 +11,7 @@
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "mozilla/dom/Element.h"
+#include "nsIDocument.h"
 
 #define AEM_LOG(...)
 // #define AEM_LOG(...) printf_stderr("AEM: " __VA_ARGS__)

js/xpconnect/src/xpcprivate.h

@@ -171,8 +171,6 @@
 #endif
 #endif /* XP_WIN */
 
-#include "nsINode.h"
-
 /***************************************************************************/
 // default initial sizes for maps (hashtables)
 

layout/forms/nsColorControlFrame.cpp

@@ -14,6 +14,7 @@
 #include "nsIDOMNode.h"
 #include "nsIFormControl.h"
 #include "nsStyleSet.h"
+#include "nsIDocument.h"
 
 using mozilla::dom::Element;
 

layout/forms/nsTextControlFrame.h

@@ -9,6 +9,7 @@
 #include "mozilla/Attributes.h"
 #include "nsContainerFrame.h"
 #include "nsIAnonymousContentCreator.h"
+#include "nsIContent.h"
 #include "nsITextControlFrame.h"
 #include "nsITextControlElement.h"
 #include "nsIStatefulFrame.h"

layout/generic/nsIAnonymousContentCreator.h

@@ -12,11 +12,11 @@
 #define nsIAnonymousContentCreator_h___
 
 #include "nsQueryFrame.h"
-#include "nsIContent.h"
 #include "nsStyleContext.h"
 #include "nsTArrayForwardDeclare.h"
 
 class nsBaseContentList;
+class nsIContent;
 class nsIFrame;
 
 /**

layout/style/nsStyleStructInlines.h

@@ -13,7 +13,7 @@
 
 #include "nsIFrame.h"
 #include "nsStyleStruct.h"
-#include "nsIContent.h"
+#include "nsIContent.h" // for GetParent()
 
 inline void
 nsStyleImage::SetSubImage(uint8_t aIndex, imgIContainer* aSubImage) const

layout/svg/SVGTextFrame.h

@@ -12,7 +12,7 @@
 #include "gfxMatrix.h"
 #include "gfxRect.h"
 #include "gfxSVGGlyphs.h"
-#include "nsIContent.h"
+#include "nsIContent.h" // for GetContent
 #include "nsStubMutationObserver.h"
 #include "nsSVGPaintServerFrame.h"
 

layout/xul/tree/nsTreeContentView.cpp

@@ -16,6 +16,7 @@
 #include "nsTreeBodyFrame.h"
 #include "mozilla/dom/Element.h"
 #include "nsServiceManagerUtils.h"
+#include "nsIDocument.h"
 
 using namespace mozilla;
 

layout/xul/tree/nsTreeUtils.cpp

@@ -10,6 +10,7 @@
 #include "nsIAtom.h"
 #include "nsNameSpaceManager.h"
 #include "nsGkAtoms.h"
+#include "nsIContent.h"
 
 using namespace mozilla;
 

parser/html/nsHtml5TreeOpExecutor.h

@@ -6,8 +6,6 @@
 #define nsHtml5TreeOpExecutor_h
 
 #include "nsIAtom.h"
-#include "nsIContent.h"
-#include "nsIDocument.h"
 #include "nsTraceRefcnt.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsHtml5SpeculativeLoad.h"
@@ -29,6 +27,8 @@ class nsHtml5Parser;
 class nsHtml5TreeBuilder;
 class nsHtml5Tokenizer;
 class nsHtml5StreamParser;
+class nsIContent;
+class nsIDocument;
 
 class nsHtml5TreeOpExecutor : public nsHtml5DocumentBuilder,
                               public nsIContentSink,

widget/android/APZCCallbackHandler.cpp

@@ -14,6 +14,7 @@
 #include "nsWindow.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "AndroidBridge.h"
+#include "nsIContent.h"
 
 using mozilla::layers::APZCCallbackHelper;
 using mozilla::layers::APZCTreeManager;