Bug 669310 - Fixes various includes and forward declarations. f=Ms2ger r=jst

content/base/public/nsContentUtils.h

@@ -79,13 +79,13 @@ static fp_except_t oldmask = fpsetmask(~allmask);
 #include "mozilla/AutoRestore.h"
 #include "nsINode.h"
 #include "nsHashtable.h"
+#include "nsIDOMNode.h"
 
 struct nsNativeKeyEvent; // Don't include nsINativeKeyBindings.h here: it will force strange compilation error!
 
 class nsIDOMScriptObjectFactory;
 class nsIXPConnect;
 class nsIContent;
-class nsIDOMNode;
 class nsIDOMKeyEvent;
 class nsIDocument;
 class nsIDocumentObserver;
@@ -122,7 +122,6 @@ struct JSRuntime;
 class nsIUGenCategory;
 class nsIWidget;
 class nsIDragSession;
-class nsPIDOMWindow;
 class nsIPresShell;
 class nsIXPConnectJSObjectHolder;
 #ifdef MOZ_XTF

content/base/src/nsContentList.h

@@ -56,7 +56,7 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 #include "nsCRT.h"
-#include "mozilla/dom/Element.h"
+#include "nsHashKeys.h"
 
 // Magic namespace id that means "match all namespaces".  This is
 // negative so it won't collide with actual namespace constants.
@@ -74,6 +74,11 @@ typedef PRBool (*nsContentListMatchFunc)(nsIContent* aContent,
 typedef void (*nsContentListDestroyFunc)(void* aData);
 
 class nsIDocument;
+namespace mozilla {
+namespace dom {
+class Element;
+}
+}
 
 
 class nsBaseContentList : public nsINodeList

content/base/src/nsCopySupport.cpp

@@ -79,6 +79,8 @@
 #include "nsContentUtils.h"
 #include "nsContentCID.h"
 
+#include "mozilla/dom/Element.h"
+
 nsresult NS_NewDomSelection(nsISelection **aDomSelection);
 
 static NS_DEFINE_CID(kCClipboardCID,           NS_CLIPBOARD_CID);

content/base/src/nsFrameLoader.h

@@ -53,8 +53,8 @@
 #include "nsAutoPtr.h"
 #include "nsFrameMessageManager.h"
 #include "Layers.h"
+#include "nsIContent.h"
 
-class nsIContent;
 class nsIURI;
 class nsSubDocumentFrame;
 class nsIView;

content/base/src/nsImageLoadingContent.cpp

@@ -79,6 +79,7 @@
 #include "nsSVGEffects.h"
 
 #include "mozAutoDocUpdate.h"
+#include "mozilla/dom/Element.h"
 
 #ifdef DEBUG_chb
 static void PrintReqURL(imgIRequest* req) {

content/base/src/nsImageLoadingContent.h

@@ -52,6 +52,7 @@
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsString.h"
+#include "nsEventStates.h"
 
 class nsIURI;
 class nsIDocument;

content/base/src/nsNodeInfo.cpp

@@ -55,6 +55,8 @@
 #include NEW_H
 #include "nsFixedSizeAllocator.h"
 #include "prprf.h"
+#include "nsIDocument.h"
+#include "nsGkAtoms.h"
 
 static const size_t kNodeInfoPoolSizes[] = {
   sizeof(nsNodeInfo)

content/base/src/nsObjectLoadingContent.cpp

@@ -96,6 +96,7 @@
 #include "nsIContentSecurityPolicy.h"
 #include "nsIChannelPolicy.h"
 #include "nsChannelPolicy.h"
+#include "mozilla/dom/Element.h"
 
 #ifdef PR_LOGGING
 static PRLogModuleInfo* gObjectLog = PR_NewLogModule("objlc");

content/base/src/nsTreeWalker.cpp

@@ -47,6 +47,8 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMNodeFilter.h"
 #include "nsDOMError.h"
+#include "nsINode.h"
+#include "nsIContent.h"
 
 #include "nsContentUtils.h"
 

content/xbl/src/nsXBLBinding.cpp

@@ -104,6 +104,8 @@
 #include "nsDOMClassInfo.h"
 #include "nsJSUtils.h"
 
+#include "mozilla/dom/Element.h"
+
 // Helper classes
 
 /***********************************************************************/

content/xbl/src/nsXBLPrototypeBinding.cpp

@@ -74,6 +74,7 @@
 
 #include "nsIStyleRuleProcessor.h"
 #include "nsXBLResourceLoader.h"
+#include "mozilla/dom/Element.h"
 
 // Helper Classes =====================================================================
 

content/xbl/src/nsXBLService.cpp

@@ -89,6 +89,7 @@
 #endif
 #include "nsIDOMEventListener.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 

content/xbl/src/nsXBLWindowKeyHandler.cpp

@@ -69,6 +69,7 @@
 #include "nsISelectionController.h"
 #include "nsGUIEvent.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 

content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp

@@ -54,6 +54,7 @@
 #include "nsUnicharUtils.h"
 #include "nsAttrName.h"
 #include "nsTArray.h"
+#include "mozilla/dom/Element.h"
 
 const PRUint32 kUnknownIndex = PRUint32(-1);
 

content/xul/content/src/nsXULPopupListener.cpp

@@ -71,6 +71,7 @@
 #include "nsHTMLReflowState.h"
 #include "nsIObjectLoadingContent.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/dom/Element.h"
 
 // for event firing in context menus
 #include "nsPresContext.h"

dom/base/nsDOMNavigationTiming.h

@@ -46,9 +46,9 @@
 #include "nsCOMPtr.h"
 #include "nsCOMArray.h"
 #include "TimeStamp.h"
+#include "nsIURI.h"
 
 class nsDOMNavigationTimingClock;
-class nsIURI;
 class nsIDocument;
 
 class nsDOMNavigationTiming

dom/base/nsJSUtils.cpp

@@ -57,6 +57,7 @@
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsPIDOMWindow.h"
 
 #include "nsDOMJSUtils.h" // for GetScriptContextFromJSContext
 

dom/plugins/base/nsNPAPIPluginInstance.cpp

@@ -59,6 +59,7 @@
 #include "nsPluginStreamListenerPeer.h"
 #include "nsSize.h"
 #include "nsNetCID.h"
+#include "nsIContent.h"
 
 using namespace mozilla;
 using namespace mozilla::plugins::parent;

dom/src/notification/nsDesktopNotification.h

@@ -57,6 +57,7 @@
 
 #include "nsDOMEventTargetHelper.h"
 #include "nsIPrivateDOMEvent.h"
+#include "nsIDocument.h"
 
 class AlertServiceObserver;
 

editor/libeditor/html/nsHTMLEditor.cpp

@@ -99,6 +99,7 @@
 
 #include "nsIFrame.h"
 #include "nsIParserService.h"
+#include "mozilla/dom/Element.h"
 
 // Some utilities to handle annoying overloading of "A" tag for link and named anchor
 static char hrefText[] = "href";

layout/base/nsDocumentViewer.cpp

@@ -195,6 +195,8 @@ static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printset
 //switch to page layout
 #include "nsGfxCIID.h"
 
+#include "mozilla/dom/Element.h"
+
 using namespace mozilla;
 
 #ifdef NS_DEBUG

layout/forms/nsButtonFrameRenderer.cpp

@@ -45,6 +45,7 @@
 #include "nsITheme.h"
 #include "nsThemeConstants.h"
 #include "nsEventStates.h"
+#include "mozilla/dom/Element.h"
 
 #define ACTIVE   "active"
 #define HOVER    "hover"

layout/generic/nsSelection.cpp

@@ -113,6 +113,7 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 #endif // IBMBIDI
 
 #include "nsDOMError.h"
+#include "mozilla/dom/Element.h"
 
 using namespace mozilla;
 

layout/inspector/src/inDOMUtils.cpp

@@ -59,6 +59,8 @@
 #include "nsEventStateManager.h"
 #include "nsIAtom.h"
 #include "nsIRange.h"
+#include "mozilla/dom/Element.h"
+
 
 ///////////////////////////////////////////////////////////////////////////////
 

layout/xul/base/src/nsButtonBoxFrame.cpp

@@ -52,6 +52,8 @@
 #include "nsIDOMElement.h"
 #include "nsDisplayList.h"
 #include "nsContentUtils.h"
+#include "mozilla/dom/Element.h"
+
 
 //
 // NS_NewXULButtonFrame

layout/xul/base/src/nsResizerFrame.cpp

@@ -60,6 +60,8 @@
 #include "nsContentUtils.h"
 #include "nsMenuPopupFrame.h"
 #include "nsIScreenManager.h"
+#include "mozilla/dom/Element.h"
+
 
 //
 // NS_NewResizerFrame

layout/xul/base/src/nsXULTooltipListener.cpp

@@ -61,6 +61,8 @@
 #include "nsIRootBox.h"
 #include "nsEventDispatcher.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/dom/Element.h"
+
 
 using namespace mozilla;
 

toolkit/components/typeaheadfind/nsTypeAheadFind.cpp

@@ -88,6 +88,7 @@
 #include "nsIWindowWatcher.h"
 #include "nsIObserverService.h"
 #include "nsFocusManager.h"
+#include "mozilla/dom/Element.h"
 
 #include "nsTypeAheadFind.h"
 

widget/src/xpwidgets/nsNativeTheme.cpp

@@ -54,6 +54,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsProgressFrame.h"
 #include "nsMenuFrame.h"
+#include "mozilla/dom/Element.h"
 
 nsNativeTheme::nsNativeTheme()
 : mAnimatedContentTimeout(PR_UINT32_MAX)