[Bug 780428] Don't include nsIFrame.h in places where it's not necessary r=roc

2024-09-13 09:24:08 -07:00 · 2012-08-05 23:00:56 -04:00 · 2012-08-05 23:00:56 -04:00 · d50e4a7565
commit d50e4a7565
parent 0039e134c7
52 changed files with 32 additions and 52 deletions
--- a/accessible/src/base/StyleInfo.cpp
+++ b/accessible/src/base/StyleInfo.cpp
@ -8,6 +8,7 @@

 #include "mozilla/dom/Element.h"
 #include "nsComputedDOMStyle.h"
+#include "nsIFrame.h"

 using namespace mozilla;
 using namespace mozilla::a11y;
--- a/accessible/src/generic/BaseAccessibles.cpp
+++ b/accessible/src/generic/BaseAccessibles.cpp
@ -15,7 +15,6 @@

 #include "nsGUIEvent.h"
 #include "nsILink.h"
-#include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsIURI.h"

--- a/accessible/src/generic/RootAccessible.cpp
+++ b/accessible/src/generic/RootAccessible.cpp
@ -33,7 +33,6 @@
 #include "nsIDOMXULMultSelectCntrlEl.h"
 #include "nsIDocument.h"
 #include "nsEventListenerManager.h"
-#include "nsIFrame.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIServiceManager.h"
 #include "nsPIDOMWindow.h"
--- a/accessible/src/msaa/DocAccessibleWrap.cpp
+++ b/accessible/src/msaa/DocAccessibleWrap.cpp
@ -17,7 +17,6 @@

 #include "nsIDocShell.h"
 #include "nsIDocShellTreeNode.h"
-#include "nsIFrame.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsISelectionController.h"
 #include "nsIServiceManager.h"
--- a/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/accessible/src/msaa/nsAccessNodeWrap.cpp
@ -20,7 +20,6 @@
 #include "nsAttrName.h"
 #include "nsIDOMNodeList.h"
 #include "nsIDOMHTMLElement.h"
-#include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsPIDOMWindow.h"
 #include "nsIServiceManager.h"
--- a/accessible/src/xul/XULTabAccessible.cpp
+++ b/accessible/src/xul/XULTabAccessible.cpp
@ -13,7 +13,6 @@
 // NOTE: alphabetically ordered
 #include "nsIAccessibleRelation.h"
 #include "nsIDocument.h"
-#include "nsIFrame.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMXULSelectCntrlEl.h"
 #include "nsIDOMXULSelectCntrlItemEl.h"
--- a/content/base/public/nsISelectionPrivate.idl
+++ b/content/base/public/nsISelectionPrivate.idl
@ -16,13 +16,12 @@ interface nsINode;

 %{C++
 class nsFrameSelection;
-class nsIFrame;
 class nsIPresShell;
 struct nsTextRangeStyle;
 struct nsPoint;
 struct ScrollAxis;
-#include "nsIFrame.h"
 #include "nsTArray.h"
+#include "nsIFrame.h"
 %}

 [ptr] native nsFrameSelection(nsFrameSelection);
--- a/content/base/src/nsObjectLoadingContent.h
+++ b/content/base/src/nsObjectLoadingContent.h
@ -20,9 +20,9 @@
 #include "nsIChannelEventSink.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsIRunnable.h"
-#include "nsIFrame.h"
 #include "nsPluginInstanceOwner.h"
 #include "nsIThreadInternal.h"
+#include "nsIFrame.h"

 class nsAsyncInstantiateEvent;
 class nsStopPluginRunnable;
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@ -26,7 +26,6 @@
 #include "nsIVariant.h"

 #include "nsIInterfaceRequestorUtils.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "nsIScriptError.h"

--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@ -17,7 +17,6 @@
 #include "nsIDocument.h"
 #include "nsCOMArray.h"
 #include "nsIFrameLoader.h"
-#include "nsIFrame.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIMarkupDocumentViewer.h"
 #include "nsIScrollableFrame.h"
@ -34,6 +33,7 @@ class nsIDocShellTreeItem;
 class imgIContainer;
 class nsDOMDataTransfer;
 class MouseEnterLeaveDispatcher;
+class nsIFrame;

 namespace mozilla {
 namespace dom {
--- a/content/html/content/public/nsHTMLCanvasElement.h
+++ b/content/html/content/public/nsHTMLCanvasElement.h
@ -10,7 +10,6 @@
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsSize.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "nsNodeInfoManager.h"

--- a/content/html/content/src/nsHTMLBodyElement.cpp
+++ b/content/html/content/src/nsHTMLBodyElement.cpp
@ -18,7 +18,6 @@
 #include "nsIMarkupDocumentViewer.h"
 #include "nsMappedAttributes.h"
 #include "nsRuleData.h"
-#include "nsIFrame.h"
 #include "nsIDocShell.h"
 #include "nsIEditorDocShell.h"
 #include "nsRuleWalker.h"
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@ -11,7 +11,6 @@
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
 #include "nsIDocument.h"
-#include "nsIFrame.h"
 #include "nsIFormControlFrame.h"
 #include "nsDOMError.h"
 #include "nsContentUtils.h"
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@ -20,7 +20,6 @@
 // Notify/query select frame for selected state
 #include "nsIFormControlFrame.h"
 #include "nsIDocument.h"
-#include "nsIFrame.h"
 #include "nsIDOMHTMLSelectElement.h"
 #include "nsNodeInfoManager.h"
 #include "nsCOMPtr.h"
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@ -12,7 +12,6 @@
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsSize.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "nsNodeInfoManager.h"
 #include "plbase64.h"
--- a/content/media/nsBuiltinDecoder.h
+++ b/content/media/nsBuiltinDecoder.h
@ -186,7 +186,6 @@ destroying the nsBuiltinDecoder object.
 #include "nsIThread.h"
 #include "nsIChannel.h"
 #include "nsIObserver.h"
-#include "nsIFrame.h"
 #include "nsAutoPtr.h"
 #include "nsSize.h"
 #include "prlog.h"
--- a/content/svg/content/src/nsSVGGradientElement.cpp
+++ b/content/svg/content/src/nsSVGGradientElement.cpp
@ -14,7 +14,6 @@
 #include "nsSVGStylableElement.h"
 #include "nsGkAtoms.h"
 #include "nsSVGGradientElement.h"
-#include "nsIFrame.h"

 using namespace mozilla;

--- a/content/svg/content/src/nsSVGPatternElement.cpp
+++ b/content/svg/content/src/nsSVGPatternElement.cpp
@ -10,7 +10,6 @@
 #include "nsCOMPtr.h"
 #include "nsGkAtoms.h"
 #include "nsSVGPatternElement.h"
-#include "nsIFrame.h"

 using namespace mozilla;

--- a/content/svg/content/src/nsSVGTextElement.cpp
+++ b/content/svg/content/src/nsSVGTextElement.cpp
@ -11,7 +11,6 @@
 #include "nsCOMPtr.h"
 #include "nsSVGSVGElement.h"
 #include "nsSVGTextPositioningElement.h"
-#include "nsIFrame.h"
 #include "nsDOMError.h"
 #include "SVGAnimatedLengthList.h"
 #include "DOMSVGAnimatedLengthList.h"
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@ -32,13 +32,13 @@
 #include "mozilla/css/Loader.h"
 #include "mozilla/dom/Element.h"
 #include "nsCharsetAlias.h"
-#include "nsIFrame.h"
 #include "nsContentUtils.h"
 #include "txXMLUtils.h"
 #include "nsContentSink.h"
 #include "nsINode.h"
 #include "nsContentCreatorFunctions.h"
 #include "txError.h"
+#include "nsIFrame.h"

 using namespace mozilla::dom;

--- a/content/xul/content/src/nsXULPopupListener.h
+++ b/content/xul/content/src/nsXULPopupListener.h
@ -15,7 +15,6 @@
 #include "nsIContent.h"
 #include "nsIDOMElement.h"
 #include "nsIDOMMouseEvent.h"
-#include "nsIFrame.h"
 #include "nsIDOMEventListener.h"
 #include "nsCycleCollectionParticipant.h"

--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@ -33,7 +33,6 @@
 #include "nsIDOMWindowUtils.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
-#include "nsIFrame.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIJSContextStack.h"
--- a/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@ -19,9 +19,9 @@
 #include "nsIContent.h"
 #include "nsTextFragment.h"
 #include "mozilla/dom/Element.h"
-#include "nsIFrame.h"
 #include "nsRange.h"
 #include "nsContentUtils.h"
+#include "nsIFrame.h"

 using namespace mozilla;

--- a/layout/base/nsBidiPresUtils.h
+++ b/layout/base/nsBidiPresUtils.h
@ -10,7 +10,6 @@
 #define nsBidiPresUtils_h___

 #include "nsTArray.h"
-#include "nsIFrame.h"
 #include "nsBidi.h"
 #include "nsBidiUtils.h"
 #include "nsCOMPtr.h"
@ -24,6 +23,7 @@

 struct BidiParagraphData;
 struct BidiLineData;
+class nsIFrame;

 /**
 * A structure representing some continuation state for each frame on the line,
--- a/layout/base/nsCSSRenderingBorders.cpp
+++ b/layout/base/nsCSSRenderingBorders.cpp
@ -5,7 +5,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "nsStyleConsts.h"
-#include "nsIFrame.h"
 #include "nsPoint.h"
 #include "nsRect.h"
 #include "nsIViewManager.h"
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@ -22,14 +22,12 @@

 #include <stdio.h>
 #include "nsQueryFrame.h"
-#include "nsEvent.h"
 #include "nsStyleContext.h"
 #include "nsStyleStruct.h"
 #include "nsStyleStructFwd.h"
-#include "nsIContent.h"
 #include "nsHTMLReflowMetrics.h"
-#include "gfxMatrix.h"
 #include "nsFrameList.h"
+#include "nsIContent.h"
 #include "nsAlgorithm.h"
 #include "mozilla/layout/FrameChildList.h"
 #include "FramePropertyTable.h"
@ -54,6 +52,7 @@
 struct nsHTMLReflowState;
 class nsHTMLReflowCommand;

+struct gfxMatrix;
 class nsIAtom;
 class nsPresContext;
 class nsIPresShell;
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@ -16,12 +16,13 @@
 #include "nsCSSProps.h"

 #include "nsIContent.h"
-#include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsWeakReference.h"
 #include "nsAutoPtr.h"
 #include "nsStyleStruct.h"
+#include "nsStyleContext.h"

+class nsIFrame;
 class nsIPresShell;

 class nsComputedDOMStyle : public nsDOMCSSDeclaration
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@ -24,7 +24,6 @@

 #include "nsPresContext.h"
 #include "nsIPresShell.h"
-#include "nsIFrame.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"

--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@ -13,7 +13,6 @@
 #include "nsIURL.h"
 #include "nsCSSPseudoElements.h"
 #include "nsIStyleRule.h"
-#include "nsIFrame.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsIStyleRuleProcessor.h"
 #include "nsPresContext.h"
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@ -23,7 +23,6 @@
 #include "nsIURL.h"
 #include "nsMappedAttributes.h"
 #include "nsILink.h"
-#include "nsIFrame.h"
 #include "nsStyleContext.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@ -22,7 +22,6 @@
 #include "nsCSSPseudoElements.h"
 #include "nsCSSRuleProcessor.h"
 #include "nsIContent.h"
-#include "nsIFrame.h"
 #include "nsRuleData.h"
 #include "nsRuleProcessorData.h"
 #include "nsTransitionManager.h"
--- a/layout/tables/nsTablePainter.h
+++ b/layout/tables/nsTablePainter.h
@ -14,7 +14,7 @@
 //Cells should paint their backgrounds only, no children
 #define NS_PAINT_FLAG_TABLE_CELL_BG_PASS  0x00000002

-#include "nsIFrame.h"
+class nsIFrame;
 class nsTableFrame;
 class nsTableRowGroupFrame;
 class nsTableRowFrame;
--- a/layout/xul/base/src/grid/nsGrid.cpp
+++ b/layout/xul/base/src/grid/nsGrid.cpp
@ -18,6 +18,7 @@
 #include "nsGridLayout2.h"
 #include "nsGridRow.h"
 #include "nsGridCell.h"
+#include "nsHTMLReflowState.h"

 /*
 The grid control expands the idea of boxes from 1 dimension to 2 dimensions. 
--- a/layout/xul/base/src/grid/nsGrid.h
+++ b/layout/xul/base/src/grid/nsGrid.h
@ -10,7 +10,6 @@
 #include "nsStackLayout.h"
 #include "nsIGridPart.h"
 #include "nsCOMPtr.h"
-#include "nsIFrame.h"

 class nsGridRowGroupLayout;
 class nsGridRowLayout;
--- a/layout/xul/base/src/grid/nsGridCell.h
+++ b/layout/xul/base/src/grid/nsGridCell.h
@ -13,10 +13,10 @@
 #ifndef nsGridCell_h___
 #define nsGridCell_h___

-#include "nsIFrame.h"
-
 class nsBoxLayoutState;
 struct nsSize;
+class nsIFrame;
+typedef class nsIFrame nsIBox;

 /*
 * Grid cell is what makes up the cellmap in the grid. Each GridCell contains
--- a/layout/xul/base/src/grid/nsGridLayout2.cpp
+++ b/layout/xul/base/src/grid/nsGridLayout2.cpp
@ -16,6 +16,7 @@
 #include "nsBox.h"
 #include "nsIScrollableFrame.h"
 #include "nsSprocketLayout.h"
+#include "nsHTMLReflowState.h"

 nsresult
 NS_NewGridLayout2( nsIPresShell* aPresShell, nsBoxLayout** aNewLayout)
--- a/layout/xul/base/src/grid/nsGridLayout2.h
+++ b/layout/xul/base/src/grid/nsGridLayout2.h
@ -10,7 +10,6 @@
 #include "nsStackLayout.h"
 #include "nsIGridPart.h"
 #include "nsCOMPtr.h"
-#include "nsIFrame.h"
 #include "nsGrid.h"

 class nsGridRowGroupLayout;
--- a/layout/xul/base/src/grid/nsGridRow.cpp
+++ b/layout/xul/base/src/grid/nsGridRow.cpp
@ -11,8 +11,8 @@
 //

 #include "nsGridRow.h"
-#include "nsIFrame.h"
 #include "nsBoxLayoutState.h"
+#include "nsIFrame.h"

 nsGridRow::nsGridRow():mIsBogus(false),
                       mBox(nullptr), 
--- a/layout/xul/base/src/grid/nsGridRow.h
+++ b/layout/xul/base/src/grid/nsGridRow.h
@ -13,10 +13,12 @@
 #ifndef nsGridRow_h___
 #define nsGridRow_h___

-#include "nsIFrame.h"
+#include "nsCoord.h"

 class nsGridLayout2;
 class nsBoxLayoutState;
+class nsIFrame;
+typedef class nsIFrame nsIBox;

 /**
 * The row (or column) data structure in the grid cellmap.
--- a/layout/xul/base/src/grid/nsGridRowGroupLayout.cpp
+++ b/layout/xul/base/src/grid/nsGridRowGroupLayout.cpp
@ -21,6 +21,7 @@
 #include "nsBoxLayoutState.h"
 #include "nsGridLayout2.h"
 #include "nsGridRow.h"
+#include "nsHTMLReflowState.h"

 already_AddRefed<nsBoxLayout> NS_NewGridRowGroupLayout()
 {
--- a/layout/xul/base/src/grid/nsIGridPart.h
+++ b/layout/xul/base/src/grid/nsIGridPart.h
@ -7,7 +7,6 @@
 #define nsIGridPart_h___

 #include "nsISupports.h"
-#include "nsFrame.h"

 class nsGridRowGroupLayout;
 class nsGrid;
--- a/layout/xul/base/src/nsBoxLayoutState.h
+++ b/layout/xul/base/src/nsBoxLayoutState.h
@ -13,7 +13,6 @@
 #ifndef nsBoxLayoutState_h___
 #define nsBoxLayoutState_h___

-#include "nsIFrame.h"
 #include "nsCOMPtr.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"
@ -21,6 +20,7 @@
 class nsRenderingContext;
 class nsCalculatedBoxInfo;
 struct nsHTMLReflowMetrics;
+struct nsHTMLReflowState;
 class nsString;
 class nsHTMLReflowCommand;

--- a/layout/xul/base/src/nsListBoxLayout.cpp
+++ b/layout/xul/base/src/nsListBoxLayout.cpp
@ -6,7 +6,6 @@
 #include "nsListBoxLayout.h"

 #include "nsListBoxBodyFrame.h"
-#include "nsIFrame.h"
 #include "nsBox.h"
 #include "nsBoxLayoutState.h"
 #include "nsIScrollableFrame.h"
--- a/layout/xul/base/src/nsListBoxLayout.h
+++ b/layout/xul/base/src/nsListBoxLayout.h
@ -7,8 +7,9 @@
 #define nsListBoxLayout_h___

 #include "nsGridRowGroupLayout.h"
-#include "nsIFrame.h"

+class nsIFrame;
+typedef class nsIFrame nsIBox;
 class nsBoxLayoutState;

 class nsListBoxLayout : public nsGridRowGroupLayout
--- a/layout/xul/base/src/nsPopupBoxObject.cpp
+++ b/layout/xul/base/src/nsPopupBoxObject.cpp
@ -10,7 +10,6 @@
 #include "nsFrameManager.h"
 #include "nsIContent.h"
 #include "nsIDOMElement.h"
-#include "nsIFrame.h"
 #include "nsINameSpaceManager.h"
 #include "nsGkAtoms.h"
 #include "nsMenuPopupFrame.h"
--- a/layout/xul/base/src/nsXULTooltipListener.cpp
+++ b/layout/xul/base/src/nsXULTooltipListener.cpp
@ -11,7 +11,6 @@
 #include "nsIDOMXULElement.h"
 #include "nsIDocument.h"
 #include "nsGkAtoms.h"
-#include "nsIFrame.h"
 #include "nsIPopupBoxObject.h"
 #include "nsMenuPopupFrame.h"
 #include "nsIServiceManager.h"
--- a/layout/xul/base/src/tree/src/nsTreeColumns.h
+++ b/layout/xul/base/src/tree/src/nsTreeColumns.h
@ -8,12 +8,16 @@

 #include "nsITreeColumns.h"
 #include "nsITreeBoxObject.h"
-#include "nsIContent.h"
-#include "nsIFrame.h"
 #include "mozilla/Attributes.h"
+#include "nsCoord.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsAutoPtr.h"

 class nsTreeBodyFrame;
 class nsTreeColumns;
+class nsIFrame;
+class nsIContent;
+struct nsRect;

 #define NS_TREECOLUMN_IMPL_CID                       \
 { /* 02cd1963-4b5d-4a6c-9223-814d3ade93a3 */         \
--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@ -25,7 +25,6 @@
 #include "nsIDocument.h"
 #include "nsIContent.h"
 #include "nsIPresShell.h"
-#include "nsIFrame.h"
 #include "nsRect.h"
 #include "nsIDOMHTMLFormElement.h"
 #include "nsILoginManager.h"
--- a/view/public/nsIView.h
+++ b/view/public/nsIView.h
@ -13,13 +13,13 @@
 #include "nsNativeWidget.h"
 #include "nsIWidget.h"
 #include "nsWidgetInitData.h"
-#include "nsIFrame.h"

 class nsIViewManager;
 class nsViewManager;
 class nsView;
 class nsWeakView;
 class nsIWidget;
+class nsIFrame;

 // Enumerated type to indicate the visibility of a layer.
 // hide - the layer is not shown.
--- a/view/public/nsIViewManager.h
+++ b/view/public/nsIViewManager.h
@ -14,6 +14,7 @@ class nsIWidget;
 struct nsRect;
 class nsRegion;
 class nsDeviceContext;
+class nsIPresShell;

 #define NS_IVIEWMANAGER_IID \
 { 0x540610a6, 0x4fdd, 0x4ae3, \
--- a/widget/cocoa/nsDragService.mm
+++ b/widget/cocoa/nsDragService.mm
@ -27,7 +27,6 @@
 #include "nsNetUtil.h"
 #include "nsIDocument.h"
 #include "nsIContent.h"
-#include "nsIFrame.h"
 #include "nsIView.h"
 #include "gfxASurface.h"
 #include "gfxContext.h"
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@ -60,7 +60,6 @@
 #include "nsIContent.h" // for menus

 // For calculating size
-#include "nsIFrame.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"