From 4e50607a9e421296c6b4cac5ac7040b4e74a689d Mon Sep 17 00:00:00 2001 From: "sharparrow1%yahoo.com" Date: Mon, 12 Feb 2007 19:17:33 +0000 Subject: [PATCH] Bug 370185: clean up view header includes (trivial). rs=bzbarsky. git-svn-id: svn://10.0.0.236/trunk@219987 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsGenericElement.cpp | 2 -- .../events/src/nsEventStateManager.cpp | 2 ++ .../html/content/src/nsGenericHTMLElement.cpp | 2 ++ .../html/content/src/nsHTMLBodyElement.cpp | 2 -- .../html/content/src/nsHTMLImageElement.cpp | 1 - .../html/document/src/nsHTMLDocument.cpp | 1 + .../html/document/src/nsImageDocument.cpp | 1 + .../svg/content/src/nsSVGSVGElement.cpp | 3 --- .../xml/document/src/nsXMLContentSink.cpp | 1 - .../xul/document/src/nsXULDocument.cpp | 2 ++ mozilla/docshell/base/nsDocShell.cpp | 3 +++ mozilla/docshell/base/nsDocShell.h | 4 ++-- mozilla/dom/src/base/nsGlobalWindow.cpp | 2 ++ mozilla/layout/base/nsImageLoader.cpp | 2 -- .../generic/nsAbsoluteContainingBlock.cpp | 1 - mozilla/layout/generic/nsAreaFrame.cpp | 2 -- mozilla/layout/generic/nsContainerFrame.cpp | 1 - mozilla/layout/generic/nsGfxScrollFrame.h | 1 + mozilla/layout/generic/nsImageFrame.cpp | 2 -- mozilla/layout/generic/nsImageMap.cpp | 1 - mozilla/layout/generic/nsLineLayout.cpp | 2 -- mozilla/layout/generic/nsPageContentFrame.cpp | 19 ------------------- mozilla/layout/generic/nsTextFrame.cpp | 2 -- mozilla/layout/generic/nsTextFrameThebes.cpp | 2 -- mozilla/layout/tables/nsTableCellFrame.cpp | 1 - mozilla/layout/tables/nsTableFrame.cpp | 1 - mozilla/layout/tables/nsTableRowFrame.cpp | 1 - .../layout/tables/nsTableRowGroupFrame.cpp | 1 - mozilla/layout/xul/base/src/nsBox.cpp | 2 -- mozilla/layout/xul/base/src/nsBoxLayout.cpp | 2 -- .../xul/base/src/nsDocElementBoxFrame.cpp | 5 ----- .../layout/xul/base/src/nsImageBoxFrame.cpp | 2 -- .../xul/base/src/nsListBoxBodyFrame.cpp | 2 ++ .../layout/xul/base/src/nsMenuBarFrame.cpp | 13 ------------- .../layout/xul/base/src/nsMenuBarListener.cpp | 2 -- .../layout/xul/base/src/nsMenuListener.cpp | 2 -- .../layout/xul/base/src/nsPopupBoxObject.cpp | 2 -- .../layout/xul/base/src/nsPopupSetFrame.cpp | 1 + .../layout/xul/base/src/nsResizerFrame.cpp | 1 - .../layout/xul/base/src/nsRootBoxFrame.cpp | 14 +------------- .../layout/xul/base/src/nsSprocketLayout.cpp | 2 -- mozilla/layout/xul/base/src/nsStackFrame.cpp | 1 - .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 1 + mozilla/view/public/nsIScrollableView.h | 3 --- mozilla/view/public/nsIView.h | 2 -- .../widget/src/xpwidgets/nsBaseFilePicker.cpp | 2 -- 46 files changed, 21 insertions(+), 103 deletions(-) diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index d56a486e7bb..79c96c35d55 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -64,8 +64,6 @@ #include "nsIPresShell.h" #include "nsPresContext.h" #include "nsStyleConsts.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsString.h" #include "nsUnicharUtils.h" #include "nsIEventStateManager.h" diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 9f583166013..3b9cafa975b 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -77,6 +77,8 @@ #include "nsINameSpaceManager.h" #include "nsIBaseWindow.h" #include "nsIScrollableView.h" +#include "nsIView.h" +#include "nsIViewManager.h" #include "nsISelection.h" #include "nsFrameSelection.h" #include "nsIDeviceContext.h" diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index 8b125cf611b..8b6ed53348d 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -71,6 +71,8 @@ #include "nsIScrollableFrame.h" #include "nsIScrollableView.h" #include "nsIScrollableViewProvider.h" +#include "nsIView.h" +#include "nsIViewManager.h" #include "nsRange.h" #include "nsIPresShell.h" #include "nsPresContext.h" diff --git a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp index 029856fcd2e..88fa283f0a9 100644 --- a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp @@ -58,9 +58,7 @@ #include "nsIDocShell.h" #include "nsIEditorDocShell.h" #include "nsCOMPtr.h" -#include "nsIView.h" #include "nsRuleWalker.h" -#include "nsIViewManager.h" //---------------------------------------------------------------------- diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index 895baba81d8..8eeb1a1bb89 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -71,7 +71,6 @@ #include "nsRuleData.h" #include "nsIJSContextStack.h" -#include "nsIView.h" #include "nsImageMapUtils.h" #include "nsIDOMHTMLMapElement.h" #include "nsEventDispatcher.h" diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 152307a0ce2..e8d1b4efb46 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -82,6 +82,7 @@ #include "nsIPrincipal.h" #include "nsIScriptSecurityManager.h" #include "nsIScrollableView.h" +#include "nsIView.h" #include "nsAttrName.h" #include "nsNodeUtils.h" diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 6a0e1991215..a82223a7cab 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -56,6 +56,7 @@ #include "nsIPresShell.h" #include "nsPresContext.h" #include "nsIScrollableView.h" +#include "nsIViewManager.h" #include "nsStyleContext.h" #include "nsAutoPtr.h" #include "nsMediaDocument.h" diff --git a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp index ad0dc60cf7a..aa0daa16fcd 100644 --- a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp @@ -50,11 +50,8 @@ #include "nsSVGPoint.h" #include "nsSVGTransform.h" #include "nsIDOMEventTarget.h" -#include "nsIViewManager.h" #include "nsIBindingManager.h" -#include "nsIWidget.h" #include "nsIFrame.h" -#include "nsIScrollableView.h" #include "nsISVGSVGFrame.h" //XXX #include "nsSVGNumber.h" #include "nsSVGRect.h" diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index fe1ae322270..c95be074e87 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -54,7 +54,6 @@ #include "nsIStyleSheetLinkingElement.h" #include "nsPresContext.h" #include "nsIPresShell.h" -#include "nsIViewManager.h" #include "nsIDOMComment.h" #include "nsIDOMCDATASection.h" #include "nsDOMDocumentType.h" diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 9e086781cbd..1d5cb467596 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -69,6 +69,8 @@ #include "nsIBoxObject.h" #include "nsIChromeRegistry.h" #include "nsIScrollableView.h" +#include "nsIView.h" +#include "nsIViewManager.h" #include "nsIContentViewer.h" #include "nsGUIEvent.h" #include "nsIDOMNSUIEvent.h" diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 3a8c65c2586..087db830c1b 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -100,6 +100,9 @@ #include "nsWidgetsCID.h" #include "nsDOMJSUtils.h" #include "nsIInterfaceRequestorUtils.h" +#include "nsIView.h" +#include "nsIViewManager.h" +#include "nsIScrollableView.h" // we want to explore making the document own the load group // so we can associate the document URI with the load group. diff --git a/mozilla/docshell/base/nsDocShell.h b/mozilla/docshell/base/nsDocShell.h index b4706fb1352..d6c0a1c1f06 100644 --- a/mozilla/docshell/base/nsDocShell.h +++ b/mozilla/docshell/base/nsDocShell.h @@ -44,8 +44,6 @@ #include "nsIPresShell.h" #include "nsIDOMNode.h" #include "nsIDOMNodeList.h" -#include "nsIViewManager.h" -#include "nsIScrollableView.h" #include "nsIContentViewer.h" #include "nsIPrefBranch.h" #include "nsVoidArray.h" @@ -107,6 +105,8 @@ #include "nsIObserver.h" #include "nsDocShellLoadTypes.h" +class nsIScrollableView; + /* load commands were moved to nsIDocShell.h */ /* load types were moved to nsDocShellLoadTypes.h */ diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 4b1b647b2a6..c64f82dd2b9 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -119,6 +119,8 @@ #include "nsIScriptGlobalObjectOwner.h" #include "nsIScriptSecurityManager.h" #include "nsIScrollableView.h" +#include "nsIView.h" +#include "nsIViewManager.h" #include "nsISelectionController.h" #include "nsISelection.h" #include "nsIPrompt.h" diff --git a/mozilla/layout/base/nsImageLoader.cpp b/mozilla/layout/base/nsImageLoader.cpp index 94594f7a237..36b542d2f56 100644 --- a/mozilla/layout/base/nsImageLoader.cpp +++ b/mozilla/layout/base/nsImageLoader.cpp @@ -55,8 +55,6 @@ #include "imgIContainer.h" -#include "nsIViewManager.h" - #include "nsStyleContext.h" #include "nsGkAtoms.h" diff --git a/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp b/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp index cd33194cef7..d22a000e151 100644 --- a/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp +++ b/mozilla/layout/generic/nsAbsoluteContainingBlock.cpp @@ -43,7 +43,6 @@ #include "nsCOMPtr.h" #include "nsAbsoluteContainingBlock.h" #include "nsContainerFrame.h" -#include "nsIViewManager.h" #include "nsIPresShell.h" #include "nsHTMLParts.h" #include "nsPresContext.h" diff --git a/mozilla/layout/generic/nsAreaFrame.cpp b/mozilla/layout/generic/nsAreaFrame.cpp index bc5e36381db..1d1421e7cf1 100644 --- a/mozilla/layout/generic/nsAreaFrame.cpp +++ b/mozilla/layout/generic/nsAreaFrame.cpp @@ -42,10 +42,8 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsPresContext.h" -#include "nsIViewManager.h" #include "nsINodeInfo.h" #include "nsGkAtoms.h" -#include "nsIView.h" #include "nsHTMLParts.h" #ifdef MOZ_XUL diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index 2e0aeee783e..709a94b7b18 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -49,7 +49,6 @@ #include "nsGUIEvent.h" #include "nsStyleConsts.h" #include "nsIView.h" -#include "nsIScrollableView.h" #include "nsHTMLContainerFrame.h" #include "nsFrameManager.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/generic/nsGfxScrollFrame.h b/mozilla/layout/generic/nsGfxScrollFrame.h index fa0409d0e39..6d837f07cbd 100644 --- a/mozilla/layout/generic/nsGfxScrollFrame.h +++ b/mozilla/layout/generic/nsGfxScrollFrame.h @@ -49,6 +49,7 @@ #include "nsGUIEvent.h" #include "nsThreadUtils.h" #include "nsIScrollableView.h" +#include "nsIView.h" class nsISupportsArray; class nsPresContext; diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 137d3f692a0..8b208a818f6 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -63,8 +63,6 @@ #include "nsISupportsPriority.h" #include "nsIServiceManager.h" #include "nsNetUtil.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsHTMLContainerFrame.h" #include "prprf.h" #include "nsIFontMetrics.h" diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp index a491d1e21fb..243d1b1eec8 100644 --- a/mozilla/layout/generic/nsImageMap.cpp +++ b/mozilla/layout/generic/nsImageMap.cpp @@ -61,7 +61,6 @@ #include "nsIPresShell.h" #include "nsIFrame.h" #include "nsFrameManager.h" -#include "nsIViewManager.h" #include "nsCoord.h" #include "nsIImageMap.h" #include "nsIConsoleService.h" diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 60c1f70737a..5c4d8529a7a 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -62,8 +62,6 @@ #include "nsIDocument.h" #include "nsIHTMLDocument.h" #include "nsIContent.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsTextFragment.h" #include "nsBidiUtils.h" #include "nsLayoutUtils.h" diff --git a/mozilla/layout/generic/nsPageContentFrame.cpp b/mozilla/layout/generic/nsPageContentFrame.cpp index e4fa9b0938c..340fffa26d8 100644 --- a/mozilla/layout/generic/nsPageContentFrame.cpp +++ b/mozilla/layout/generic/nsPageContentFrame.cpp @@ -46,13 +46,6 @@ #include "nsSimplePageSequence.h" #include "nsDisplayList.h" -#include "nsIView.h" - -#if defined(DEBUG_rods) || defined(DEBUG_dcone) -//#define DEBUG_PRINTING -#endif - - nsIFrame* NS_NewPageContentFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) { @@ -106,18 +99,6 @@ NS_IMETHODIMP nsPageContentFrame::Reflow(nsPresContext* aPresContext, NS_ASSERTION(aPresContext->IsDynamic() || !NS_FRAME_IS_COMPLETE(aStatus) || !frame->GetNextInFlow(), "bad child flow list"); - -#ifdef DEBUG_PRINTING - nsRect r = frame->GetRect(); - printf("PCF: Area Frame %p Bounds: %5d,%5d,%5d,%5d\n", frame, r.x, r.y, r.width, r.height); - nsIView* view = frame->GetView(); - if (view) { - r = view->GetBounds(); - printf("PCF: Area Frame View Bounds: %5d,%5d,%5d,%5d\n", r.x, r.y, r.width, r.height); - } else { - printf("PCF: Area Frame View Bounds: NO VIEW\n"); - } -#endif } // Reflow our fixed frames mFixedContainer.Reflow(this, aPresContext, aReflowState, diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 24ccfa8f2af..e0858746251 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -63,8 +63,6 @@ #include "nsIFontMetrics.h" #include "nsIRenderingContext.h" #include "nsIPresShell.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsITimer.h" #include "prtime.h" #include "nsVoidArray.h" diff --git a/mozilla/layout/generic/nsTextFrameThebes.cpp b/mozilla/layout/generic/nsTextFrameThebes.cpp index f8f922d9415..d63e77f23e6 100644 --- a/mozilla/layout/generic/nsTextFrameThebes.cpp +++ b/mozilla/layout/generic/nsTextFrameThebes.cpp @@ -64,8 +64,6 @@ #include "nsIFontMetrics.h" #include "nsIRenderingContext.h" #include "nsIPresShell.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsITimer.h" #include "prtime.h" #include "nsVoidArray.h" diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index b545538cd20..4f87564a50b 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -50,7 +50,6 @@ #include "nsGenericHTMLElement.h" #include "nsHTMLParts.h" #include "nsGkAtoms.h" -#include "nsIView.h" #include "nsIPresShell.h" #include "nsCOMPtr.h" #include "nsIDOMHTMLTableCellElement.h" diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index fdc3abeb839..97fec85d9fa 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -60,7 +60,6 @@ #include "nsPresContext.h" #include "nsCSSRendering.h" #include "nsStyleConsts.h" -#include "nsIView.h" #include "nsGkAtoms.h" #include "nsCSSAnonBoxes.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index d5555af658f..fe24d8a3955 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -45,7 +45,6 @@ #include "nsIContent.h" #include "nsTableFrame.h" #include "nsTableCellFrame.h" -#include "nsIView.h" #include "nsCSSRendering.h" #include "nsHTMLParts.h" #include "nsTableColGroupFrame.h" diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index e3cf0ec8d8b..cce9b411d8c 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -45,7 +45,6 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsIContent.h" -#include "nsIView.h" #include "nsGkAtoms.h" #include "nsIPresShell.h" #include "nsCSSRendering.h" diff --git a/mozilla/layout/xul/base/src/nsBox.cpp b/mozilla/layout/xul/base/src/nsBox.cpp index ab86254b16f..08e4385e177 100644 --- a/mozilla/layout/xul/base/src/nsBox.cpp +++ b/mozilla/layout/xul/base/src/nsBox.cpp @@ -43,8 +43,6 @@ #include "nsPresContext.h" #include "nsCOMPtr.h" #include "nsIContent.h" -#include "nsIViewManager.h" -#include "nsIView.h" #include "nsIPresShell.h" #include "nsHTMLContainerFrame.h" #include "nsINameSpaceManager.h" diff --git a/mozilla/layout/xul/base/src/nsBoxLayout.cpp b/mozilla/layout/xul/base/src/nsBoxLayout.cpp index 1eed2652e22..2dea7d9ff36 100644 --- a/mozilla/layout/xul/base/src/nsBoxLayout.cpp +++ b/mozilla/layout/xul/base/src/nsBoxLayout.cpp @@ -47,8 +47,6 @@ #include "nsPresContext.h" #include "nsCOMPtr.h" #include "nsIContent.h" -#include "nsIViewManager.h" -#include "nsIView.h" #include "nsIPresShell.h" #include "nsHTMLContainerFrame.h" #include "nsIFrame.h" diff --git a/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp b/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp index e2c3dffad4e..9d4739c90fd 100644 --- a/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsDocElementBoxFrame.cpp @@ -39,20 +39,15 @@ #include "nsCSSRendering.h" #include "nsIDocument.h" #include "nsPresContext.h" -#include "nsViewsCID.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsIWidget.h" #include "nsPageFrame.h" #include "nsIRenderingContext.h" #include "nsGUIEvent.h" #include "nsIDOMEvent.h" #include "nsStyleConsts.h" -#include "nsIViewManager.h" #include "nsGkAtoms.h" #include "nsIEventStateManager.h" #include "nsIDeviceContext.h" -#include "nsIScrollableView.h" #include "nsIPresShell.h" #include "nsBoxFrame.h" #include "nsStackLayout.h" diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp index 73fe6182a88..b4f47cf7e99 100644 --- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp @@ -67,8 +67,6 @@ #include "nsILinkHandler.h" #include "nsIURL.h" #include "nsILoadGroup.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsHTMLContainerFrame.h" #include "prprf.h" #include "nsIFontMetrics.h" diff --git a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp index 251b961e287..d26ad6f954f 100644 --- a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp @@ -58,6 +58,8 @@ #include "nsIScrollableFrame.h" #include "nsIScrollbarFrame.h" #include "nsIScrollableView.h" +#include "nsIView.h" +#include "nsIViewManager.h" #include "nsStyleContext.h" #include "nsIRenderingContext.h" #include "nsIDeviceContext.h" diff --git a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp index 1ba37150124..d8d24f332c2 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp @@ -51,8 +51,6 @@ #include "nsIDOMEventReceiver.h" #include "nsGkAtoms.h" #include "nsMenuFrame.h" -#include "nsIView.h" -#include "nsIViewManager.h" #include "nsMenuPopupFrame.h" #include "nsGUIEvent.h" #include "nsUnicharUtils.h" @@ -754,17 +752,6 @@ nsMenuBarFrame::GetWidget(nsIWidget **aWidget) // why we need a widget at all. *aWidget = nsnull; return NS_OK; - -#if DONT_WANT_TO_DO_THIS - // Get parent view - nsIView * view = nsnull; - nsMenuPopupFrame::GetNearestEnclosingView(GetPresContext(), this, &view); - if (!view) - return NS_OK; - - *aWidget = view->GetWidget(); - NS_IF_ADDREF(*aWidget); -#endif } NS_IMETHODIMP diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index eb259bcac72..83e22907623 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -58,8 +58,6 @@ #include "nsIEventStateManager.h" -#include "nsIViewManager.h" -#include "nsIView.h" #include "nsISupportsArray.h" #include "nsContentUtils.h" diff --git a/mozilla/layout/xul/base/src/nsMenuListener.cpp b/mozilla/layout/xul/base/src/nsMenuListener.cpp index 72a02b9fe95..ab5a06c955b 100644 --- a/mozilla/layout/xul/base/src/nsMenuListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuListener.cpp @@ -59,8 +59,6 @@ #include "nsIEventStateManager.h" -#include "nsIViewManager.h" -#include "nsIView.h" #include "nsISupportsArray.h" /* diff --git a/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp b/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp index 4899a8217f6..6544e05766c 100644 --- a/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp +++ b/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp @@ -51,8 +51,6 @@ #include "nsINameSpaceManager.h" #include "nsGkAtoms.h" #include "nsMenuPopupFrame.h" -#include "nsIViewManager.h" -#include "nsIWidget.h" class nsPopupBoxObject : public nsBoxObject, diff --git a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp index 884d4c8dfa5..504fbf73de9 100644 --- a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp +++ b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp @@ -72,6 +72,7 @@ #include "nsPIDOMWindow.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIBaseWindow.h" +#include "nsIViewManager.h" #define NS_MENU_POPUP_LIST_INDEX 0 diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.cpp b/mozilla/layout/xul/base/src/nsResizerFrame.cpp index d1889ae5676..e6c08a620be 100644 --- a/mozilla/layout/xul/base/src/nsResizerFrame.cpp +++ b/mozilla/layout/xul/base/src/nsResizerFrame.cpp @@ -52,7 +52,6 @@ #include "nsIDocShellTreeOwner.h" #include "nsIBaseWindow.h" #include "nsPIDOMWindow.h" -#include "nsIViewManager.h" #include "nsGUIEvent.h" #include "nsEventDispatcher.h" diff --git a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp index aee054f9c24..9bd817f8822 100644 --- a/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsRootBoxFrame.cpp @@ -34,25 +34,13 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ + #include "nsHTMLParts.h" -#include "nsContainerFrame.h" -#include "nsCSSRendering.h" #include "nsIDocument.h" -#include "nsPresContext.h" -#include "nsViewsCID.h" -#include "nsIView.h" -#include "nsIViewManager.h" -#include "nsIWidget.h" -#include "nsPageFrame.h" #include "nsIRenderingContext.h" #include "nsGUIEvent.h" -#include "nsIDOMEvent.h" #include "nsStyleConsts.h" -#include "nsIViewManager.h" #include "nsGkAtoms.h" -#include "nsIEventStateManager.h" -#include "nsIDeviceContext.h" -#include "nsIScrollableView.h" #include "nsIPresShell.h" #include "nsBoxFrame.h" #include "nsStackLayout.h" diff --git a/mozilla/layout/xul/base/src/nsSprocketLayout.cpp b/mozilla/layout/xul/base/src/nsSprocketLayout.cpp index 1fd2715eb6f..255bfdf117b 100644 --- a/mozilla/layout/xul/base/src/nsSprocketLayout.cpp +++ b/mozilla/layout/xul/base/src/nsSprocketLayout.cpp @@ -49,8 +49,6 @@ #include "nsPresContext.h" #include "nsCOMPtr.h" #include "nsIContent.h" -#include "nsIViewManager.h" -#include "nsIView.h" #include "nsIPresShell.h" #include "nsHTMLContainerFrame.h" #include "nsBoxFrame.h" diff --git a/mozilla/layout/xul/base/src/nsStackFrame.cpp b/mozilla/layout/xul/base/src/nsStackFrame.cpp index a0193443336..3b39b3b6d9c 100644 --- a/mozilla/layout/xul/base/src/nsStackFrame.cpp +++ b/mozilla/layout/xul/base/src/nsStackFrame.cpp @@ -51,7 +51,6 @@ #include "nsHTMLParts.h" #include "nsIPresShell.h" #include "nsCSSRendering.h" -#include "nsIViewManager.h" #include "nsBoxLayoutState.h" #include "nsStackLayout.h" #include "nsDisplayList.h" diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index 72a01af1ea1..89960e4b7d1 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp @@ -77,6 +77,7 @@ #include "nsXPIDLString.h" #include "nsHTMLContainerFrame.h" #include "nsIView.h" +#include "nsIViewManager.h" #include "nsWidgetsCID.h" #include "nsBoxFrame.h" #include "nsBoxObject.h" diff --git a/mozilla/view/public/nsIScrollableView.h b/mozilla/view/public/nsIScrollableView.h index 3012b4bf12e..dedd8bbbc62 100644 --- a/mozilla/view/public/nsIScrollableView.h +++ b/mozilla/view/public/nsIScrollableView.h @@ -39,12 +39,9 @@ #define nsIScrollableView_h___ #include "nsCoord.h" -#include "nsIViewManager.h" -#include "nsIView.h" class nsIView; class nsIScrollPositionListener; -struct nsMargin; struct nsSize; // IID for the nsIScrollableView interface diff --git a/mozilla/view/public/nsIView.h b/mozilla/view/public/nsIView.h index f86ddf72276..80f0653b396 100644 --- a/mozilla/view/public/nsIView.h +++ b/mozilla/view/public/nsIView.h @@ -41,14 +41,12 @@ #include "nsCoord.h" #include "nsRect.h" #include "nsPoint.h" -#include #include "nsIWidget.h" class nsIViewManager; class nsIScrollableView; class nsViewManager; class nsView; -struct nsRect; // Enumerated type to indicate the visibility of a layer. // hide - the layer is not shown. diff --git a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp index f01fee45ac4..2cd3bc2b4af 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp @@ -46,8 +46,6 @@ #include "nsIBaseWindow.h" #include "nsIContentViewer.h" #include "nsIDocumentViewer.h" -#include "nsIViewManager.h" -#include "nsIView.h" #include "nsIWidget.h" #include "nsIStringBundle.h"