Bug 847007: Remove nsIContent includes r=Ms2ger

accessible/src/base/TreeWalker.h

@@ -7,7 +7,8 @@
 #define mozilla_a11y_TreeWalker_h_
 
 #include "nsAutoPtr.h"
-#include "nsIContent.h"
+
+class nsIContent;
 
 namespace mozilla {
 namespace a11y {

accessible/src/base/nsTextEquivUtils.h

@@ -9,10 +9,10 @@
 #define _nsTextEquivUtils_H_
 
 #include "Accessible.h"
+#include "nsIStringBundle.h"
 #include "Role.h"
 
-#include "nsIContent.h"
+class nsIContent;
-#include "nsIStringBundle.h"
 
 /**
  * Text equivalent computation rules (see nsTextEquivUtils::gRoleToNameRulesMap)

accessible/src/generic/Accessible.h

@@ -16,8 +16,8 @@
 #include "nsIAccessibleSelectable.h"
 #include "nsIAccessibleValue.h"
 #include "nsIAccessibleStates.h"
-#include "nsIContent.h"
 
+#include "nsIContent.h"
 #include "nsStringGlue.h"
 #include "nsTArray.h"
 #include "nsRefPtrHashtable.h"
@@ -25,7 +25,6 @@
 struct nsRoleMapEntry;
 
 struct nsRect;
-class nsIContent;
 class nsIFrame;
 class nsIAtom;
 class nsView;

accessible/src/generic/BaseAccessibles.h

@@ -8,7 +8,8 @@
 
 #include "AccessibleWrap.h"
 #include "HyperTextAccessibleWrap.h"
-#include "nsIContent.h"
+
+class nsIContent;
 
 /**
   * This file contains a number of classes that are used as base

accessible/src/windows/msaa/nsAccessNodeWrap.h

@@ -23,7 +23,6 @@
 #include "nsIAccessible.h"
 #include "nsIAccessibleEvent.h"
 #include "nsIDOMElement.h"
-#include "nsIContent.h"
 #include "nsAccessNode.h"
 #include "oleidl.h"
 #include "oleacc.h"
@@ -43,6 +42,8 @@
   { }                                                                                 \
   return E_FAIL;
 
+class nsIContent;
+
 namespace mozilla {
 namespace a11y {
 

content/base/public/nsIFrameLoader.idl

@@ -5,6 +5,7 @@
 
 #include "nsISupports.idl"
 
+interface nsFrameLoader;
 interface nsIDocShell;
 interface nsIURI;
 interface nsIFrame;

content/base/public/nsTreeSanitizer.h

@@ -5,11 +5,12 @@
 #ifndef nsTreeSanitizer_h_
 #define nsTreeSanitizer_h_
 
-#include "nsIContent.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsIPrincipal.h"
 #include "mozilla/dom/Element.h"
 
+class nsIContent;
+
 /**
  * See the documentation of nsIParserUtils::sanitize for documentation
  * about the default behavior and the configuration options of this sanitizer.

content/base/src/nsPlainTextSerializer.h

@@ -12,15 +12,17 @@
 #ifndef nsPlainTextSerializer_h__
 #define nsPlainTextSerializer_h__
 
-#include "nsIContentSerializer.h"
+#include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
-#include "nsString.h"
-#include "nsILineBreaker.h"
-#include "nsIContent.h"
 #include "nsIAtom.h"
+#include "nsIContentSerializer.h"
 #include "nsIDocumentEncoder.h"
+#include "nsILineBreaker.h"
+#include "nsString.h"
 #include "nsTArray.h"
 
+class nsIContent;
+
 namespace mozilla {
 namespace dom {
 class Element;

content/base/src/nsXMLContentSerializer.h

@@ -12,7 +12,6 @@
 #ifndef nsXMLContentSerializer_h__
 #define nsXMLContentSerializer_h__
 
-#include "nsIContent.h"
 #include "nsIContentSerializer.h"
 #include "nsISupportsUtils.h"
 #include "nsCOMPtr.h"
@@ -22,8 +21,9 @@
 #define kIndentStr NS_LITERAL_STRING("  ")
 #define kEndTag NS_LITERAL_STRING("</")
 
-class nsIDOMNode;
 class nsIAtom;
+class nsIDOMNode;
+class nsINode;
 
 class nsXMLContentSerializer : public nsIContentSerializer {
  public:

content/events/src/TextComposition.cpp

@@ -9,6 +9,7 @@
 #include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
 #include "nsGUIEvent.h"
+#include "nsIContent.h"
 #include "nsIMEStateManager.h"
 #include "nsIPresShell.h"
 #include "nsIWidget.h"

content/events/src/nsContentEventHandler.h

@@ -11,14 +11,15 @@
 
 #include "nsISelection.h"
 #include "nsRange.h"
-#include "nsIContent.h"
 #include "nsIDOMTreeWalker.h"
 
-class nsPresContext;
+class nsCaret;
+class nsIContent;
 class nsIPresShell;
+class nsPresContext;
 class nsQueryContentEvent;
 class nsSelectionEvent;
-class nsCaret;
+
 struct nsRect;
 
 /*

content/events/src/nsEventStateManager.h

@@ -10,7 +10,6 @@
 
 #include "nsEvent.h"
 #include "nsGUIEvent.h"
-#include "nsIContent.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 #include "nsITimer.h"
@@ -26,6 +25,7 @@
 #include "nsIFrame.h"
 
 class nsIPresShell;
+class nsIContent;
 class nsIDocument;
 class nsIDocShell;
 class nsIDocShellTreeNode;

content/html/content/src/UndoManager.h

@@ -10,10 +10,10 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
+#include "nsIContent.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/Nullable.h"
-#include "nsIContent.h"
 
 class nsITransactionManager;
 class nsIMutationObserver;

content/xbl/src/nsBindingManager.h

@@ -6,6 +6,7 @@
 #ifndef nsBindingManager_h_
 #define nsBindingManager_h_
 
+#include "nsIContent.h"
 #include "nsStubMutationObserver.h"
 #include "pldhash.h"
 #include "nsInterfaceHashtable.h"
@@ -17,7 +18,6 @@
 #include "nsThreadUtils.h"
 
 struct ElementDependentRuleProcessorData;
-class nsIContent;
 class nsIXPConnectWrappedJS;
 class nsIAtom;
 class nsIDOMNodeList;

content/xbl/src/nsXBLProtoImplField.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIAtom.h"
+#include "nsIContent.h"
 #include "nsString.h"
 #include "nsJSUtils.h"
 #include "jsapi.h"

content/xbl/src/nsXBLProtoImplMethod.h

@@ -9,11 +9,12 @@
 #include "nsIAtom.h"
 #include "nsString.h"
 #include "jsapi.h"
-#include "nsIContent.h"
 #include "nsString.h"
 #include "nsXBLProtoImplMember.h"
 #include "nsXBLSerialize.h"
 
+class nsIContent;
+
 struct nsXBLParameter {
   nsXBLParameter* mNext;
   char* mName;

content/xbl/src/nsXBLProtoImplProperty.h

@@ -9,7 +9,6 @@
 #include "nsIAtom.h"
 #include "nsString.h"
 #include "jsapi.h"
-#include "nsIContent.h"
 #include "nsString.h"
 #include "nsXBLSerialize.h"
 #include "nsXBLProtoImplMember.h"

content/xbl/src/nsXBLPrototypeBinding.h

@@ -12,7 +12,6 @@
 #include "nsXBLProtoImplMethod.h"
 #include "nsICSSLoaderObserver.h"
 #include "nsWeakReference.h"
-#include "nsIContent.h"
 #include "nsHashtable.h"
 #include "nsClassHashtable.h"
 #include "nsXBLDocumentInfo.h"
@@ -20,6 +19,7 @@
 #include "nsXBLProtoImpl.h"
 
 class nsIAtom;
+class nsIContent;
 class nsIDocument;
 class nsIScriptContext;
 class nsSupportsHashtable;

content/xbl/src/nsXBLPrototypeResources.h

@@ -6,7 +6,7 @@
 #ifndef nsXBLPrototypeResources_h__
 #define nsXBLPrototypeResources_h__
 
-#include "nsCOMPtr.h"
+#include "nsAutoPtr.h"
 #include "nsICSSLoaderObserver.h"
 #include "nsIStyleRuleProcessor.h"
 

content/xul/content/src/nsXULContextMenuBuilder.cpp

@@ -4,6 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsContentCreatorFunctions.h"
+#include "nsIContent.h"
+#include "nsIDOMDocumentFragment.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMHTMLMenuItemElement.h"
 #include "nsXULContextMenuBuilder.h"

content/xul/content/src/nsXULContextMenuBuilder.h

@@ -5,12 +5,15 @@
 
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
-#include "nsIContent.h"
 #include "nsIMenuBuilder.h"
 #include "nsIXULContextMenuBuilder.h"
-#include "nsIDOMDocumentFragment.h"
 #include "nsCycleCollectionParticipant.h"
 
+class nsIAtom;
+class nsIContent;
+class nsIDocument;
+class nsIDOMHTMLElement;
+
 class nsXULContextMenuBuilder : public nsIMenuBuilder,
                                 public nsIXULContextMenuBuilder
 {

content/xul/content/src/nsXULElement.h

@@ -25,7 +25,6 @@
 #include "nsEventListenerManager.h"
 #include "nsIRDFCompositeDataSource.h"
 #include "nsIRDFResource.h"
-#include "nsBindingManager.h"
 #include "nsIURI.h"
 #include "nsIXULTemplateBuilder.h"
 #include "nsIBoxObject.h"

content/xul/templates/src/nsXULTemplateBuilder.h

@@ -8,7 +8,6 @@
 
 #include "nsStubDocumentObserver.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsIContent.h"
 #include "nsIObserver.h"
 #include "nsIRDFCompositeDataSource.h"
 #include "nsIRDFContainer.h"
@@ -31,9 +30,10 @@
 extern PRLogModuleInfo* gXULTemplateLog;
 #endif
 
-class nsIXULDocument;
+class nsIContent;
-class nsIRDFCompositeDataSource;
 class nsIObserverService;
+class nsIRDFCompositeDataSource;
+class nsIXULDocument;
 
 /**
  * An object that translates an RDF graph into a presentation using a

content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsCOMPtr.h"
+#include "nsICollation.h"
 #include "nsIDOMNode.h"
 #include "nsIRDFNode.h"
 #include "nsIRDFObserver.h"

content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h

@@ -7,7 +7,6 @@
 #ifndef nsXULTemplateQueryProcessorRDF_h__
 #define nsXULTemplateQueryProcessorRDF_h__
 
-#include "nsIContent.h"
 #include "nsIRDFContainer.h"
 #include "nsIRDFContainerUtils.h"
 #include "nsIRDFDataSource.h"
@@ -15,7 +14,6 @@
 #include "nsIRDFService.h"
 #include "nsIXULTemplateBuilder.h"
 #include "nsIXULTemplateQueryProcessor.h"
-#include "nsICollation.h"
 #include "nsCollationCID.h"
 
 #include "nsResourceSet.h"
@@ -24,7 +22,6 @@
 #include "nsRDFBinding.h"
 #include "nsXULTemplateResultSetRDF.h"
 #include "nsCOMArray.h"
-#include "nsIArray.h"
 #include "nsString.h"
 #include "nsClassHashtable.h"
 #include "nsRefPtrHashtable.h"
@@ -36,6 +33,7 @@
 extern PRLogModuleInfo* gXULTemplateLog;
 #endif
 
+class nsIContent;
 class nsIRDFCompositeDataSource;
 class nsXULTemplateResultRDF;
 

docshell/base/nsDSURIContentListener.cpp

@@ -10,6 +10,7 @@
 #include "nsXPIDLString.h"
 #include "nsDocShellCID.h"
 #include "nsIWebNavigationInfo.h"
+#include "nsIDocument.h"
 #include "nsIDOMWindow.h"
 #include "nsNetUtil.h"
 #include "nsAutoPtr.h"

docshell/base/nsILinkHandler.h

@@ -6,13 +6,13 @@
 #define nsILinkHandler_h___
 
 #include "nsISupports.h"
-#include "nsIContent.h"
 
-class nsIInputStream;
+class nsGUIEvent;
+class nsIContent;
 class nsIDocShell;
+class nsIInputStream;
 class nsIRequest;
 class nsString;
-class nsGUIEvent;
 
 // Interface ID for nsILinkHandler
 #define NS_ILINKHANDLER_IID \

dom/base/nsFocusManager.h

@@ -6,11 +6,12 @@
 #ifndef nsFocusManager_h___
 #define nsFocusManager_h___
 
+#include "nsCycleCollectionParticipant.h"
+#include "nsIDocument.h"
 #include "nsIFocusManager.h"
-#include "nsWeakReference.h"
 #include "nsIObserver.h"
-#include "nsIContent.h"
 #include "nsIWidget.h"
+#include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
 
 #define FOCUSMETHOD_MASK 0xF000
@@ -18,6 +19,7 @@
 
 #define FOCUSMANAGER_CONTRACTID "@mozilla.org/focus-manager;1"
 
+class nsIContent;
 class nsIDocShellTreeItem;
 class nsPIDOMWindow;
 

dom/base/nsGlobalWindow.h

@@ -51,7 +51,6 @@
 #include "nsIDOMStorageIndexedDB.h"
 #include "nsIDOMOfflineResourceList.h"
 #include "nsIArray.h"
-#include "nsIContent.h"
 #include "nsIIDBFactory.h"
 #include "nsFrameMessageManager.h"
 #include "mozilla/LinkedList.h"
@@ -91,6 +90,7 @@
 // Min idle notification time in seconds.
 #define MIN_IDLE_NOTIFICATION_TIME_S 1
 
+class nsIContent;
 class nsIDOMBarProp;
 class nsIDocument;
 class nsPresContext;

dom/base/nsJSTimeoutHandler.cpp

@@ -6,6 +6,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsIScriptContext.h"
+#include "nsIDocument.h"
 #include "nsIArray.h"
 #include "nsIScriptTimeoutHandler.h"
 #include "nsIXPConnect.h"

dom/base/nsWindowMemoryReporter.cpp

@@ -6,6 +6,7 @@
 
 #include "nsWindowMemoryReporter.h"
 #include "nsGlobalWindow.h"
+#include "nsIDocument.h"
 #include "nsIEffectiveTLDService.h"
 #include "mozilla/Services.h"
 #include "mozilla/Preferences.h"

dom/base/nsWindowRoot.cpp

@@ -15,6 +15,7 @@
 #include "nsGUIEvent.h"
 #include "nsGlobalWindow.h"
 #include "nsFocusManager.h"
+#include "nsIContent.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIDOMHTMLTextAreaElement.h"
 #include "nsIControllers.h"

dom/camera/DOMCameraPreview.cpp

@@ -8,6 +8,7 @@
 #include "DOMCameraPreview.h"
 #include "CameraCommon.h"
 #include "nsGlobalWindow.h"
+#include "nsIDocument.h"
 #include "nsPIDOMWindow.h"
 
 using namespace mozilla;

dom/workers/URL.cpp

@@ -15,6 +15,7 @@
 #include "nsGlobalWindow.h"
 #include "nsHostObjectProtocolHandler.h"
 
+#include "nsIDocument.h"
 #include "nsIDOMFile.h"
 
 USING_WORKERS_NAMESPACE

js/xpconnect/wrappers/XrayWrapper.cpp

@@ -12,6 +12,7 @@
 #include "WrapperFactory.h"
 
 #include "nsINode.h"
+#include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsContentUtils.h"
 

layout/forms/nsListControlFrame.h

@@ -22,10 +22,10 @@
 #include "nsIListControlFrame.h"
 #include "nsISelectControlFrame.h"
 #include "nsIDOMEventListener.h"
-#include "nsIContent.h"
 #include "nsAutoPtr.h"
 #include "nsSelectsAreaFrame.h"
 
+class nsIContent;
 class nsIDOMHTMLSelectElement;
 class nsIDOMHTMLOptionsCollection;
 class nsIDOMHTMLOptionElement;

layout/printing/nsPrintObject.h

@@ -9,13 +9,13 @@
 
 // Interfaces
 #include "nsCOMPtr.h"
-#include "nsIContent.h"
 #include "nsIPresShell.h"
 #include "nsStyleSet.h"
 #include "nsViewManager.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeOwner.h"
 
+class nsIContent;
 class nsIDocument;
 class nsPresContext;
 

layout/style/nsHTMLCSSStyleSheet.h

@@ -12,6 +12,8 @@
 
 #include "mozilla/Attributes.h"
 
+#include "nsCOMPtr.h"
+#include "nsDataHashtable.h"
 #include "nsIStyleSheet.h"
 #include "nsIStyleRuleProcessor.h"
 

layout/style/nsHTMLStyleSheet.h

@@ -12,12 +12,13 @@
 #ifndef nsHTMLStyleSheet_h_
 #define nsHTMLStyleSheet_h_
 
-#include "nsIStyleSheet.h"
+#include "nsAutoPtr.h"
-#include "nsIStyleRuleProcessor.h"
-#include "nsIStyleRule.h"
-#include "pldhash.h"
-#include "nsCOMPtr.h"
 #include "nsColor.h"
+#include "nsCOMPtr.h"
+#include "nsIStyleRule.h"
+#include "nsIStyleRuleProcessor.h"
+#include "nsIStyleSheet.h"
+#include "pldhash.h"
 #include "mozilla/Attributes.h"
 
 class nsMappedAttributes;

layout/style/nsIStyleRuleProcessor.h

@@ -14,7 +14,6 @@
 
 #include "nsISupports.h"
 #include "nsChangeHint.h"
-#include "nsIContent.h"
 
 struct RuleProcessorData;
 struct ElementRuleProcessorData;

layout/style/nsRuleProcessorData.h

@@ -14,7 +14,6 @@
 #include "nsPresContext.h" // for nsCompatibility
 #include "nsString.h"
 #include "nsChangeHint.h"
-#include "nsIContent.h"
 #include "nsCSSPseudoElements.h"
 #include "nsRuleWalker.h"
 #include "nsNthIndexCache.h"
@@ -23,10 +22,11 @@
 #include "mozilla/BloomFilter.h"
 #include "mozilla/GuardObjects.h"
 
-class nsIStyleSheet;
-class nsIAtom;
-class nsICSSPseudoComparator;
 class nsAttrValue;
+class nsIAtom;
+class nsIContent;
+class nsICSSPseudoComparator;
+class nsIStyleSheet;
 struct TreeMatchContext;
 
 /**

layout/xul/base/src/nsMenuFrame.h

@@ -19,12 +19,12 @@
 #include "nsMenuParent.h"
 #include "nsXULPopupManager.h"
 #include "nsITimer.h"
-#include "nsIContent.h"
 #include "mozilla/Attributes.h"
 
 nsIFrame* NS_NewMenuFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 nsIFrame* NS_NewMenuItemFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
+class nsIContent;
 class nsMenuBarFrame;
 
 #define NS_STATE_ACCELTEXT_IS_DERIVED  NS_STATE_BOX_CHILD_RESERVED

layout/xul/base/src/nsXULTooltipListener.h

@@ -8,7 +8,6 @@
 
 #include "nsIDOMEventListener.h"
 #include "nsIDOMMouseEvent.h"
-#include "nsIContent.h"
 #include "nsIDOMElement.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
@@ -20,6 +19,8 @@
 #include "nsWeakPtr.h"
 #include "mozilla/Attributes.h"
 
+class nsIContent;
+
 class nsXULTooltipListener MOZ_FINAL : public nsIDOMEventListener
 {
 public:

layout/xul/tree/nsTreeContentView.h

@@ -6,6 +6,7 @@
 #ifndef nsTreeContentView_h__
 #define nsTreeContentView_h__
 
+#include "nsCycleCollectionParticipant.h"
 #include "nsTArray.h"
 #include "nsStubDocumentObserver.h"
 #include "nsITreeBoxObject.h"

layout/xul/tree/nsTreeUtils.cpp

@@ -9,6 +9,7 @@
 #include "nsCRT.h"
 #include "nsIAtom.h"
 #include "nsINameSpaceManager.h"
+#include "nsISupportsArray.h"
 #include "nsGkAtoms.h"
 #include "nsINodeInfo.h"
 

layout/xul/tree/nsTreeUtils.h

@@ -6,9 +6,13 @@
 #ifndef nsTreeUtils_h__
 #define nsTreeUtils_h__
 
+#include "nsError.h"
 #include "nsString.h"
 #include "nsTreeStyleCache.h"
-#include "nsIContent.h"
+
+class nsIAtom;
+class nsIContent;
+class nsISupportsArray;
 
 class nsTreeUtils
 {

netwerk/dash/mpd/nsDASHWebMODParser.h

@@ -77,8 +77,6 @@
 #define DASHWEBMODPARSER_H_
 
 #include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIDOMElement.h"
 #include "IMPDParser.h"
 #include "MPD.h"
 #include "Period.h"
@@ -86,6 +84,8 @@
 #include "Representation.h"
 #include "SegmentBase.h"
 
+class nsIDOMElement;
+
 namespace mozilla {
 namespace net {
 

widget/xpwidgets/nsBaseDragService.h

@@ -12,7 +12,6 @@
 #include "nsISupportsArray.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMDataTransfer.h"
-#include "nsIContent.h"
 #include "nsCOMPtr.h"
 #include "nsPoint.h"
 
@@ -21,6 +20,7 @@
 // translucency level for drag images
 #define DRAG_TRANSLUCENCY 0.65
 
+class nsIContent;
 class nsIDOMNode;
 class nsIFrame;
 class nsPresContext;