Bug 370185: clean up view header includes (trivial). rs=bzbarsky.

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"

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"

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"

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"
 
 //----------------------------------------------------------------------
 

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"

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"
 

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"

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"

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"

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"

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.

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 */
 

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"

layout/base/nsImageLoader.cpp

@@ -55,8 +55,6 @@
 
 #include "imgIContainer.h"
 
-#include "nsIViewManager.h"
-
 #include "nsStyleContext.h"
 #include "nsGkAtoms.h"
 

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"

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

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"

layout/generic/nsGfxScrollFrame.h

@@ -49,6 +49,7 @@
 #include "nsGUIEvent.h"
 #include "nsThreadUtils.h"
 #include "nsIScrollableView.h"
+#include "nsIView.h"
 
 class nsISupportsArray;
 class nsPresContext;

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"

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"

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"

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,

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"
 

layout/xul/base/src/nsMenuListener.cpp

@@ -59,8 +59,6 @@
 
 #include "nsIEventStateManager.h"
 
-#include "nsIViewManager.h"
-#include "nsIView.h"
 #include "nsISupportsArray.h"
 
 /*

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,

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
 

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"
 

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"

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"

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"

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"

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

view/public/nsIView.h

@@ -41,14 +41,12 @@
 #include "nsCoord.h"
 #include "nsRect.h"
 #include "nsPoint.h"
-#include <stdio.h>
 #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.

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"