Bug 913603 - Avoid needlessly including nsRect.h - r=jrmuizel

accessible/src/mac/AccessibleWrap.h

@@ -16,7 +16,6 @@
 #include "States.h"
 
 #include "nsCOMPtr.h"
-#include "nsRect.h"
 
 #include "nsTArray.h"
 #include "nsAutoPtr.h"

content/html/content/src/nsClientRect.h

@@ -9,13 +9,14 @@
 #include "nsIDOMClientRect.h"
 #include "nsIDOMClientRectList.h"
 #include "nsTArray.h"
-#include "nsRect.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
 
+struct nsRect;
+
 class nsClientRect MOZ_FINAL : public nsIDOMClientRect
                              , public nsWrapperCache
 {

content/media/wmf/DXVA2Manager.h

@@ -9,9 +9,9 @@
 #include "WMF.h"
 #include "nsAutoPtr.h"
 #include "mozilla/Mutex.h"
-#include "nsRect.h"
 
-class nsIntSize;
+struct nsIntSize;
+struct nsIntRect;
 
 namespace mozilla {
 

dom/base/nsGlobalWindow.h

@@ -34,7 +34,6 @@
 #include "nsEventListenerManager.h"
 #include "nsIPrincipal.h"
 #include "nsSize.h"
-#include "nsRect.h"
 #include "mozFlushType.h"
 #include "prclist.h"
 #include "nsIDOMStorageEvent.h"
@@ -98,7 +97,8 @@ class nsGlobalWindow;
 class nsDOMEventTargetHelper;
 class nsDOMWindowUtils;
 class nsIIdleService;
-class nsIntSize;
+struct nsIntSize;
+struct nsRect;
 
 class nsWindowSizes;
 

dom/plugins/ipc/PluginInterposeOSX.h

@@ -33,7 +33,6 @@
 #include "base/basictypes.h"
 #include "nsPoint.h"
 #include "npapi.h"
-#include "nsRect.h"
 
 // Make this includable from non-Objective-C code.
 #ifndef __OBJC__

dom/plugins/ipc/PluginUtilsOSX.h

@@ -8,9 +8,10 @@
 #define dom_plugins_PluginUtilsOSX_h 1
 
 #include "npapi.h"
-#include "nsRect.h"
 #include "mozilla/gfx/QuartzSupport.h"
 
+struct nsIntRect;
+
 namespace mozilla {
 namespace plugins {
 namespace PluginUtilsOSX {

gfx/layers/composite/TextureHost.h

@@ -21,7 +21,6 @@
 #include "mozilla/mozalloc.h"           // for operator delete
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_RUNTIMEABORT
-#include "nsRect.h"                     // for nsIntRect
 #include "nsRegion.h"                   // for nsIntRegion
 #include "nsTraceRefcnt.h"              // for MOZ_COUNT_CTOR, etc
 #include "nscore.h"                     // for nsACString
@@ -30,7 +29,7 @@ class gfxImageSurface;
 class gfxReusableSurfaceWrapper;
 struct nsIntPoint;
 struct nsIntSize;
-
+struct nsIntRect;
 
 namespace mozilla {
 namespace ipc {

gfx/layers/d3d9/DeviceManagerD3D9.h

@@ -7,12 +7,13 @@
 #define GFX_DEVICEMANAGERD3D9_H
 
 #include "gfxTypes.h"
-#include "nsRect.h"
 #include "nsAutoPtr.h"
 #include "d3d9.h"
 #include "nsTArray.h"
 #include "mozilla/layers/CompositorTypes.h"
 
+struct nsIntRect;
+
 namespace mozilla {
 namespace layers {
 

gfx/layers/opengl/LayerManagerOGLProgram.h

@@ -16,11 +16,11 @@
 #include "mozilla/gfx/Types.h"
 #include "nsDebug.h"                    // for NS_ASSERTION
 #include "nsPoint.h"                    // for nsIntPoint
-#include "nsRect.h"                     // for nsIntRect
 #include "nsTArray.h"                   // for nsTArray
 #include "mozilla/layers/CompositorTypes.h"
 
 struct gfxRGBA;
+struct nsIntRect;
 
 namespace mozilla {
 namespace gl {

gfx/layers/opengl/TextureHostOGL.h

@@ -28,8 +28,6 @@
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_WARNING
 #include "nsISupportsImpl.h"            // for TextureImage::Release, etc
-#include "nsRect.h"                     // for nsIntRect
-#include "nsSize.h"                     // for nsIntSize
 #include "nsTraceRefcnt.h"              // for MOZ_COUNT_CTOR, etc
 #include "LayerManagerOGLProgram.h"     // for ShaderProgramType, etc
 #ifdef MOZ_WIDGET_GONK
@@ -40,6 +38,8 @@ class gfxImageSurface;
 class gfxReusableSurfaceWrapper;
 class nsIntRegion;
 struct nsIntPoint;
+struct nsIntRect;
+struct nsIntSize;
 
 namespace mozilla {
 namespace gfx {

gfx/thebes/gfxAlphaRecovery.h

@@ -9,7 +9,8 @@
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
 #include "mozilla/SSE.h"
-#include "nsRect.h"
+
+struct nsIntRect;
 
 class gfxAlphaRecovery {
 public:

gfx/thebes/gfxD2DSurface.h

@@ -8,11 +8,11 @@
 
 #include "gfxASurface.h"
 #include "nsPoint.h"
-#include "nsRect.h"
 
 #include <windows.h>
 
 struct ID3D10Texture2D;
+struct nsIntRect;
 
 class gfxD2DSurface : public gfxASurface {
 public:

gfx/thebes/gfxQtNativeRenderer.h

@@ -10,9 +10,9 @@
 #include "gfxASurface.h"
 #include "gfxContext.h"
 #include "gfxXlibSurface.h"
-#include "nsRect.h"
 
 class QRect;
+struct nsIntRect;
 
 /**
  * This class lets us take code that draws into an Xlib surface drawable and lets us

gfx/thebes/gfxRect.h

@@ -11,10 +11,10 @@
 #include "gfxPoint.h"
 #include "gfxCore.h"
 #include "nsDebug.h"
+#include "nsRect.h"
 #include "mozilla/gfx/BaseMargin.h"
 #include "mozilla/gfx/BaseRect.h"
 #include "mozilla/Assertions.h"
-#include "nsRect.h"
 
 struct gfxMargin : public mozilla::gfx::BaseMargin<gfxFloat, gfxMargin> {
   typedef mozilla::gfx::BaseMargin<gfxFloat, gfxMargin> Super;

gfx/thebes/gfxXlibNativeRenderer.h

@@ -8,12 +8,14 @@
 
 #include "gfxColor.h"
 #include "nsAutoPtr.h"
-#include "nsRect.h"
 #include <X11/Xlib.h>
 
 class gfxASurface;
 class gfxXlibSurface;
 class gfxContext;
+struct nsIntRect;
+struct nsIntPoint;
+struct nsIntSize;
 
 /**
  * This class lets us take code that draws into an X drawable and lets us

image/src/ImageOps.h

@@ -8,10 +8,10 @@
 #define MOZILLA_IMAGELIB_IMAGEOPS_H_
 
 #include "nsCOMPtr.h"
-#include "nsRect.h"
 #include "Orientation.h"
 
 class imgIContainer;
+struct nsIntRect;
 
 namespace mozilla {
 namespace image {

image/src/imgDecoderObserver.h

@@ -7,9 +7,10 @@
 #define MOZILLA_IMAGELIB_IMGDECODEROBSERVER_H_
 
 #include "nsRect.h"
-#include "mozilla/RefPtr.h"
 #include "mozilla/WeakPtr.h"
 
+struct nsIntRect;
+
 /**
  * imgDecoderObserver interface
  *

image/src/imgFrame.cpp

@@ -20,6 +20,7 @@ static bool gDisableOptimize = false;
 #include "GeckoProfiler.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"
+#include "nsMargin.h"
 
 #if defined(XP_WIN)
 

layout/base/nsIPresShell.h

@@ -31,7 +31,6 @@
 #include "nsEvent.h"
 #include "nsCompatibility.h"
 #include "nsFrameManagerBase.h"
-#include "nsRect.h"
 #include "mozFlushType.h"
 #include "nsWeakReference.h"
 #include <stdio.h> // for FILE definition
@@ -74,6 +73,7 @@ class nsPIDOMWindow;
 struct nsPoint;
 struct nsIntPoint;
 struct nsIntRect;
+struct nsRect;
 class nsRegion;
 class nsRefreshDriver;
 class nsARefreshObserver;

layout/base/nsPresState.h

@@ -13,7 +13,6 @@
 
 #include "nsPoint.h"
 #include "nsAutoPtr.h"
-#include "nsRect.h"
 
 class nsPresState
 {

layout/generic/nsFrame.h

@@ -11,7 +11,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Likely.h"
 #include "nsBox.h"
-#include "nsRect.h"
 #include "prlog.h"
 
 #include "nsIPresShell.h"
@@ -98,6 +97,7 @@
 
 struct nsBoxLayoutMetrics;
 class nsDisplayBackgroundImage;
+struct nsRect;
 
 /**
  * Implementation of a simple frame that's not splittable and has no

layout/generic/nsIPageSequenceFrame.h

@@ -6,7 +6,7 @@
 #define nsIPageSequenceFrame_h___
 
 #include "nsQueryFrame.h"
-#include "nsRect.h"
+#include "nsCoord.h"
 
 class nsPresContext;
 class nsIPrintSettings;

layout/generic/nsImageMap.h

@@ -13,13 +13,13 @@
 #include "nsTArray.h"
 #include "nsStubMutationObserver.h"
 #include "nsIDOMEventListener.h"
-#include "nsRect.h"
 
 class Area;
 class nsRenderingContext;
 class nsImageFrame;
 class nsIFrame;
 class nsIContent;
+struct nsRect;
 
 class nsImageMap : public nsStubMutationObserver,
                    public nsIDOMEventListener

layout/generic/nsPluginUtilsOSX.h

@@ -10,10 +10,11 @@
 #import <Carbon/Carbon.h>
 #endif
 
-#include "nsRect.h"
 #include "nsIWidget.h"
 #include "npapi.h"
 
+struct nsRect;
+
 // We use void pointers to avoid exporting native event types to cross-platform code.
 
 #ifndef __LP64__

layout/mathml/nsMathMLChar.h

@@ -16,7 +16,6 @@ class nsGlyphTable;
 class nsIFrame;
 class nsDisplayListBuilder;
 class nsDisplayListSet;
-class nsRect;
 class nsPresContext;
 class nsRenderingContext;
 class nsBoundingMetrics;

layout/svg/nsISVGChildFrame.h

@@ -8,7 +8,6 @@
 
 #include "gfxRect.h"
 #include "nsQueryFrame.h"
-#include "nsRect.h"
 
 class nsIFrame;
 class nsRenderingContext;
@@ -16,6 +15,8 @@ class nsRenderingContext;
 struct gfxMatrix;
 struct nsPoint;
 class SVGBBox;
+struct nsRect;
+struct nsIntRect;
 
 namespace mozilla {
 class SVGAnimatedLengthList;

layout/svg/nsSVGContainerFrame.h

@@ -8,7 +8,6 @@
 
 #include "mozilla/Attributes.h"
 #include "gfxMatrix.h"
-#include "gfxRect.h"
 #include "nsContainerFrame.h"
 #include "nsFrame.h"
 #include "nsIFrame.h"
@@ -24,6 +23,8 @@ class nsRenderingContext;
 class nsStyleContext;
 
 struct nsPoint;
+struct nsRect;
+struct nsIntRect;
 
 typedef nsContainerFrame nsSVGContainerFrameBase;
 

layout/svg/nsSVGFilterFrame.h

@@ -9,7 +9,6 @@
 #include "mozilla/Attributes.h"
 #include "nsFrame.h"
 #include "nsQueryFrame.h"
-#include "nsRect.h"
 #include "nsSVGContainerFrame.h"
 #include "nsSVGUtils.h"
 
@@ -23,6 +22,8 @@ class nsSVGFilterPaintCallback;
 class nsSVGIntegerPair;
 class nsSVGLength2;
 
+struct nsRect;
+
 namespace mozilla {
 namespace dom {
 class SVGFilterElement;

layout/svg/nsSVGGeometryFrame.h

@@ -13,7 +13,6 @@
 #include "nsFrame.h"
 #include "nsIFrame.h"
 #include "nsQueryFrame.h"
-#include "nsRect.h"
 
 class gfxContext;
 class nsIContent;

layout/svg/nsSVGIntegrationUtils.h

@@ -9,13 +9,15 @@
 #include "gfxMatrix.h"
 #include "gfxPattern.h"
 #include "gfxRect.h"
-#include "nsRect.h"
 
 class nsDisplayList;
 class nsDisplayListBuilder;
 class nsIFrame;
 class nsRenderingContext;
 
+struct nsRect;
+struct nsIntRect;
+
 namespace mozilla {
 namespace layers {
 class LayerManager;

layout/svg/nsSVGPathGeometryFrame.h

@@ -13,7 +13,6 @@
 #include "nsISVGChildFrame.h"
 #include "nsLiteralString.h"
 #include "nsQueryFrame.h"
-#include "nsRect.h"
 #include "nsSVGGeometryFrame.h"
 #include "nsSVGUtils.h"
 
@@ -28,6 +27,8 @@ class nsSVGMarkerFrame;
 class nsSVGMarkerProperty;
 
 struct nsPoint;
+struct nsRect;
+struct nsIntRect;
 
 typedef nsSVGGeometryFrame nsSVGPathGeometryFrameBase;
 

layout/svg/nsSVGUtils.h

@@ -21,8 +21,6 @@
 #include "nsID.h"
 #include "nsISupportsBase.h"
 #include "nsMathUtils.h"
-#include "nsPoint.h"
-#include "nsRect.h"
 #include "nsStyleStruct.h"
 #include "mozilla/Constants.h"
 #include <algorithm>
@@ -51,6 +49,9 @@ class gfxTextObjectPaint;
 
 struct nsStyleSVG;
 struct nsStyleSVGPaint;
+struct nsRect;
+struct nsIntRect;
+struct nsPoint;
 
 namespace mozilla {
 class SVGAnimatedPreserveAspectRatio;

layout/tables/nsCellMap.h

@@ -9,7 +9,6 @@
 #include "celldata.h"
 #include "nsTArray.h"
 #include "nsTArray.h"
-#include "nsRect.h"
 #include "nsCOMPtr.h"
 #include "nsAlgorithm.h"
 #include "nsAutoPtr.h"
@@ -25,6 +24,7 @@ class nsTableFrame;
 class nsCellMap;
 class nsPresContext;
 class nsCellMapColumnIterator;
+struct nsIntRect;
 
 struct nsColInfo
 {

widget/android/AndroidDirectTexture.h

@@ -7,10 +7,11 @@
 #define AndroidDirectTexture_h_
 
 #include "gfxASurface.h"
-#include "nsRect.h"
 #include "mozilla/Mutex.h"
 #include "AndroidGraphicBuffer.h"
 
+struct nsIntRect;
+
 namespace mozilla {
 
 /**

widget/android/AndroidGraphicBuffer.h

@@ -7,11 +7,12 @@
 #define AndroidGraphicBuffer_h_
 
 #include "gfxASurface.h"
-#include "nsRect.h"
 
 typedef void* EGLImageKHR;
 typedef void* EGLClientBuffer;
 
+struct nsIntRect;
+
 namespace mozilla {
 
 /**

widget/android/AndroidJavaWrappers.h

@@ -11,7 +11,6 @@
 #include <android/log.h>
 
 #include "nsGeoPosition.h"
-#include "nsPoint.h"
 #include "nsRect.h"
 #include "nsString.h"
 #include "nsTArray.h"

widget/gonk/nsAppShell.h

@@ -20,7 +20,6 @@
 
 #include "mozilla/Mutex.h"
 #include "nsBaseAppShell.h"
-#include "nsRect.h"
 #include "nsTArray.h"
 
 #include "utils/RefBase.h"

widget/windows/WinUtils.h

@@ -14,7 +14,6 @@
 #include "nsAutoPtr.h"
 #include "nsString.h"
 #include "nsRegion.h"
-#include "nsRect.h"
 
 #include "nsThreadUtils.h"
 #include "nsICryptoHash.h"
@@ -30,6 +29,7 @@
 class nsWindow;
 class nsWindowBase;
 struct KeyPair;
+struct nsIntRect;
 
 namespace mozilla {
 namespace widget {

widget/windows/nsWindow.h

@@ -25,6 +25,7 @@
 #include "nsITimer.h"
 #include "nsRegion.h"
 #include "mozilla/TimeStamp.h"
+#include "nsMargin.h"
 
 #ifdef CAIRO_HAS_D2D_SURFACE
 #include "gfxD2DSurface.h"

widget/windows/winrt/MetroUtils.cpp

@@ -21,6 +21,7 @@
 #include "nsIURI.h"
 #include "prlog.h"
 #include "nsIObserverService.h"
+#include "nsRect.h"
 
 #include <wrl/wrappers/corewrappers.h>
 #include <windows.ui.applicationsettings.h>

widget/windows/winrt/MetroUtils.h

@@ -9,7 +9,6 @@
 #include "nsThreadUtils.h"
 #include "nsString.h"
 #include "nsPoint.h"
-#include "nsRect.h"
 
 #include "mozwrlbase.h"
 
@@ -49,6 +48,7 @@ void LogW(const wchar_t *fmt, ...);
 
 class nsIBrowserDOMWindow;
 class nsIDOMWindow;
+struct nsIntRect;
 
 namespace mozilla {
 namespace widget {