Bug 1024084: Clean up forward declarations and #includes in nsFrameManager.h and nsFrameManagerBase.h. r=jwatt

layout/base/RestyleManager.h

@@ -16,8 +16,9 @@
 #include "RestyleTracker.h"
 #include "nsPresContext.h"
 
-class nsRefreshDriver;
 class nsIFrame;
+class nsRefreshDriver;
+class nsStyleChangeList;
 struct TreeMatchContext;
 
 namespace mozilla {

layout/base/nsFrameManager.h

@@ -19,11 +19,15 @@
 #ifndef _nsFrameManager_h_
 #define _nsFrameManager_h_
 
-#include "nsIFrame.h"
 #include "nsFrameManagerBase.h"
+
+#include "nsAutoPtr.h"
+#include "nsFrameList.h"
 #include "nsIContent.h"
+#include "nsStyleContext.h"
 
 class nsContainerFrame;
+class nsPlaceholderFrame;
 
 namespace mozilla {
 /**
@@ -75,7 +79,7 @@ struct UndisplayedNode {
 
 class nsFrameManager : public nsFrameManagerBase
 {
-  typedef nsIFrame::ChildListID ChildListID;
+  typedef mozilla::layout::FrameChildListID ChildListID;
 
 public:
   nsFrameManager(nsIPresShell *aPresShell, nsStyleSet* aStyleSet) {

layout/base/nsFrameManagerBase.h

@@ -19,17 +19,12 @@
 #ifndef _nsFrameManagerBase_h_
 #define _nsFrameManagerBase_h_
 
+#include "nsDebug.h"
 #include "pldhash.h"
 
+class nsIFrame;
 class nsIPresShell;
 class nsStyleSet;
-class nsIContent;
-class nsPlaceholderFrame;
-class nsIFrame;
-class nsStyleContext;
-class nsIAtom;
-class nsStyleChangeList;
-class nsILayoutHistoryState;
 
 class nsFrameManagerBase
 {

layout/style/AnimationCommon.h

@@ -20,8 +20,9 @@
 #include "mozilla/FloatingPoint.h"
 #include "nsCSSPseudoElements.h"
 
-class nsPresContext;
 class nsIFrame;
+class nsPresContext;
+class nsStyleChangeList;
 class ElementPropertyTransition;