Bug 924221 - Minimize the #includes in gfx/thebes; r=bjacob

--HG--
extra : rebase_source : af198eb9b9739ce718ba0d16c385624a722cde51

accessible/src/base/TextAttrs.cpp

@@ -15,6 +15,7 @@
 #include "nsLayoutUtils.h"
 #include "HyperTextAccessible.h"
 #include "mozilla/AppUnits.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;

accessible/src/windows/sdn/sdnTextAccessible.cpp

@@ -17,6 +17,7 @@
 #include "nsLayoutUtils.h"
 #include "gfxFont.h"
 #include "nsIAccessibleTypes.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla::a11y;
 

content/base/src/nsLineBreaker.cpp

@@ -9,6 +9,7 @@
 #include "gfxFont.h" // for the gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_* values
 #include "nsHyphenationManager.h"
 #include "nsHyphenator.h"
+#include "mozilla/gfx/2D.h"
 
 nsLineBreaker::nsLineBreaker()
   : mCurrentWordLanguage(nullptr),

content/canvas/src/CanvasRenderingContext2D.h

@@ -20,6 +20,8 @@
 #include "mozilla/dom/CanvasRenderingContext2DBinding.h"
 #include "mozilla/dom/CanvasPattern.h"
 #include "mozilla/gfx/Rect.h"
+#include "mozilla/gfx/2D.h"
+#include "gfx2DGlue.h"
 
 class nsXULElement;
 

content/svg/content/src/SVGContentUtils.cpp

@@ -19,6 +19,7 @@
 #include "SVGAnimationElement.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "nsContentUtils.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/svg/content/src/SVGFEFloodElement.cpp

@@ -6,6 +6,7 @@
 #include "mozilla/dom/SVGFEFloodElement.h"
 #include "mozilla/dom/SVGFEFloodElementBinding.h"
 #include "gfxContext.h"
+#include "gfxColor.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(FEFlood)
 

content/svg/content/src/SVGPathData.cpp

@@ -12,6 +12,7 @@
 #include <stdarg.h>
 #include "SVGContentUtils.h"
 #include "SVGPathSegUtils.h"
+#include "gfxContext.h"
 #include <algorithm>
 
 using namespace mozilla;

gfx/gl/GLContext.cpp

@@ -23,12 +23,14 @@
 #include "SurfaceStream.h"
 #include "GfxTexturesReporter.h"
 #include "TextureGarbageBin.h"
+#include "gfx2DGlue.h"
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Preferences.h"
 
 #ifdef XP_MACOSX
 #include <CoreServices/CoreServices.h>
+#include "gfxColor.h"
 #endif
 
 #if defined(MOZ_WIDGET_COCOA)

gfx/layers/ThebesLayerBuffer.cpp

@@ -30,6 +30,7 @@
 #include "mozilla/layers/ShadowLayers.h"  // for ShadowableLayer
 #include "mozilla/layers/TextureClient.h"  // for DeprecatedTextureClient
 #include "nsSize.h"                     // for nsIntSize
+#include "gfx2DGlue.h"
 
 namespace mozilla {
 

gfx/layers/client/ContentClient.cpp

@@ -30,6 +30,7 @@
 #ifdef XP_WIN
 #include "gfxWindowsPlatform.h"
 #endif
+#include "gfx2DGlue.h"
 
 namespace mozilla {
 

gfx/layers/client/TiledContentClient.cpp

@@ -21,6 +21,7 @@
 #include "nsSize.h"                     // for nsIntSize
 #include "gfxReusableSharedImageSurfaceWrapper.h"
 #include "nsMathUtils.h"               // for NS_roundf
+#include "gfx2DGlue.h"
 
 #ifdef GFX_TILEDLAYER_DEBUG_OVERLAY
 #include "cairo.h"

gfx/src/nsFont.cpp

@@ -15,6 +15,7 @@
 #include "nsUnicharUtils.h"
 #include "nscore.h"                     // for PRUnichar
 #include "prtypes.h"                    // for PR_STATIC_ASSERT
+#include "mozilla/gfx/2D.h"
 
 nsFont::nsFont(const char* aName, uint8_t aStyle, uint8_t aVariant,
                uint16_t aWeight, int16_t aStretch, uint8_t aDecoration,

gfx/thebes/gfx2DGlue.h

@@ -14,6 +14,7 @@
 #include "mozilla/gfx/Matrix.h"
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/2D.h"
+#include "gfxColor.h"
 
 namespace mozilla {
 namespace gfx {

gfx/thebes/gfxASurface.cpp

@@ -47,7 +47,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsISupportsUtils.h"
 #include "nsCOMPtr.h"
-#include "nsIConsoleService.h"
 #include "nsServiceManagerUtils.h"
 #include "nsString.h"
 #include "nsIClipboardHelper.h"

gfx/thebes/gfxAlphaRecovery.h

@@ -6,11 +6,12 @@
 #ifndef _GFXALPHARECOVERY_H_
 #define _GFXALPHARECOVERY_H_
 
-#include "gfxContext.h"
-#include "gfxImageSurface.h"
 #include "mozilla/SSE.h"
+#include "gfxTypes.h"
+#include "nsRect.h"
 
 struct nsIntRect;
+class gfxImageSurface;
 
 class gfxAlphaRecovery {
 public:

gfx/thebes/gfxAlphaRecoverySSE2.cpp

@@ -3,8 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/SSE.h"
 #include "gfxAlphaRecovery.h"
+#include "gfxImageSurface.h"
+#include "nsRect.h"
 #include <emmintrin.h>
 
 // This file should only be compiled on x86 and x64 systems.  Additionally,

gfx/thebes/gfxAndroidPlatform.cpp

@@ -17,6 +17,7 @@
 #include "nsIScreen.h"
 #include "nsIScreenManager.h"
 #include "nsILocaleService.h"
+#include "nsServiceManagerUtils.h"
 
 #include "cairo.h"
 

gfx/thebes/gfxBaseSharedMemorySurface.cpp

@@ -4,7 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "gfxSharedImageSurface.h"
+#include "gfxBaseSharedMemorySurface.h"
+#include "cairo.h"
 
 const cairo_user_data_key_t SHM_KEY = {0};
 

gfx/thebes/gfxBaseSharedMemorySurface.h

@@ -9,12 +9,13 @@
 
 #include "mozilla/ipc/Shmem.h"
 #include "mozilla/ipc/SharedMemory.h"
-#include "cairo.h"
 
 #include "gfxASurface.h"
 #include "gfxImageSurface.h"
 #include "pratom.h"
 
+typedef struct _cairo_user_data_key cairo_user_data_key_t;
+
 struct SharedImageInfo {
     int32_t width;
     int32_t height;

gfx/thebes/gfxBlur.cpp

@@ -4,6 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gfxBlur.h"
+#include "gfxContext.h"
+#include "gfxImageSurface.h"
 
 #include "mozilla/gfx/Blur.h"
 

gfx/thebes/gfxBlur.h

@@ -6,9 +6,14 @@
 #ifndef GFX_BLUR_H
 #define GFX_BLUR_H
 
-#include "gfxContext.h"
-#include "gfxImageSurface.h"
 #include "gfxTypes.h"
+#include "nsSize.h"
+#include "nsAutoPtr.h"
+#include "gfxPoint.h"
+
+class gfxContext;
+class gfxImageSurface;
+struct gfxRect;
 
 namespace mozilla {
   namespace gfx {

gfx/thebes/gfxContext.cpp

@@ -9,7 +9,6 @@
 #include <math.h>
 
 #include "mozilla/Alignment.h"
-#include "mozilla/Constants.h"
 
 #include "cairo.h"
 
@@ -22,6 +21,7 @@
 #include "gfxPlatform.h"
 #include "gfxTeeSurface.h"
 #include "GeckoProfiler.h"
+#include "gfx2DGlue.h"
 #include <algorithm>
 
 #if CAIRO_HAS_DWRITE_FONT

gfx/thebes/gfxContext.h

@@ -9,14 +9,13 @@
 #include "gfxTypes.h"
 
 #include "gfxASurface.h"
-#include "gfxColor.h"
 #include "gfxPoint.h"
 #include "gfxRect.h"
 #include "gfxMatrix.h"
 #include "gfxPattern.h"
 #include "gfxPath.h"
-#include "nsISupportsImpl.h"
 #include "nsTArray.h"
+#include "nsAutoPtr.h"
 
 #include "mozilla/gfx/2D.h"
 

gfx/thebes/gfxCoreTextShaper.cpp

@@ -4,29 +4,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Util.h"
-
-#include "nsAlgorithm.h"
-#include "nsString.h"
-#include "nsBidiUtils.h"
-
-#include "gfxTypes.h"
-
-#include "nsPromiseFlatString.h"
-
-#include "gfxContext.h"
-#include "gfxPlatform.h"
-#include "gfxPlatformMac.h"
 #include "gfxCoreTextShaper.h"
 #include "gfxMacFont.h"
-
-#include "gfxFontTest.h"
 #include "gfxFontUtils.h"
+#include "mozilla/gfx/2D.h"
 
-#include "gfxQuartzSurface.h"
-#include "gfxMacPlatformFontList.h"
-#include "gfxUserFontSet.h"
-
-#include "nsUnicodeRange.h"
 #include <algorithm>
 
 using namespace mozilla;

gfx/thebes/gfxCoreTextShaper.h

@@ -6,13 +6,9 @@
 #ifndef GFX_CORETEXTSHAPER_H
 #define GFX_CORETEXTSHAPER_H
 
-#include "gfxTypes.h"
 #include "gfxFont.h"
-#include "gfxFontUtils.h"
-#include "gfxPlatform.h"
-#include "gfxMacPlatformFontList.h"
 
-#include <Carbon/Carbon.h>
+#include <ApplicationServices/ApplicationServices.h>
 
 class gfxMacFont;
 

gfx/thebes/gfxDrawable.cpp

@@ -7,7 +7,6 @@
 #include "gfxASurface.h"
 #include "gfxContext.h"
 #include "gfxPlatform.h"
-#include "mozilla/arm.h"
 #ifdef MOZ_X11
 #include "cairo.h"
 #include "gfxXlibSurface.h"

gfx/thebes/gfxDrawable.h

@@ -6,11 +6,8 @@
 #ifndef GFX_DRAWABLE_H
 #define GFX_DRAWABLE_H
 
-#include "nsISupportsImpl.h"
 #include "nsAutoPtr.h"
-#include "gfxTypes.h"
 #include "gfxRect.h"
-#include "gfxColor.h"
 #include "gfxMatrix.h"
 #include "GraphicsFilter.h"
 

gfx/thebes/gfxFT2FontBase.cpp

@@ -7,6 +7,7 @@
 #include "gfxFT2Utils.h"
 #include "harfbuzz/hb.h"
 #include "mozilla/Likely.h"
+#include "gfxFontConstants.h"
 
 using namespace mozilla::gfx;
 

gfx/thebes/gfxFT2FontList.cpp

@@ -52,6 +52,7 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIMemory.h"
+#include "gfxFontConstants.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/scache/StartupCache.h"

gfx/thebes/gfxFont.cpp

@@ -12,7 +12,6 @@
 #include "prlog.h"
 
 #include "nsServiceManagerUtils.h"
-#include "nsReadableUtils.h"
 #include "nsExpirationTracker.h"
 #include "nsILanguageAtomService.h"
 #include "nsITimer.h"
@@ -22,7 +21,6 @@
 #include "nsGkAtoms.h"
 
 #include "gfxTypes.h"
-#include "nsAlgorithm.h"
 #include "gfxContext.h"
 #include "gfxFontMissingGlyphs.h"
 #include "gfxUserFontSet.h"
@@ -40,6 +38,7 @@
 #include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 #include "gfxSVGGlyphs.h"
+#include "gfx2DGlue.h"
 
 #include "cairo.h"
 #include "gfxFontTest.h"
@@ -50,6 +49,7 @@
 
 #include "nsCRT.h"
 #include "GeckoProfiler.h"
+#include "gfxFontConstants.h"
 
 #include <algorithm>
 

gfx/thebes/gfxFont.h

@@ -6,7 +6,6 @@
 #ifndef GFX_FONT_H
 #define GFX_FONT_H
 
-#include "nsAlgorithm.h"
 #include "gfxTypes.h"
 #include "nsString.h"
 #include "gfxPoint.h"
@@ -17,22 +16,19 @@
 #include "gfxSkipChars.h"
 #include "gfxRect.h"
 #include "nsExpirationTracker.h"
-#include "gfxFontConstants.h"
 #include "gfxPlatform.h"
 #include "nsIAtom.h"
-#include "nsISupportsImpl.h"
-#include "gfxPattern.h"
 #include "mozilla/HashFunctions.h"
 #include "nsIMemoryReporter.h"
 #include "nsIObserver.h"
 #include "gfxFontFeatures.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/gfx/Types.h"
 #include "mozilla/Attributes.h"
 #include <algorithm>
-#include "nsUnicodeProperties.h"
-#include "harfbuzz/hb.h"
 #include "DrawMode.h"
+#include "nsUnicodeScriptCodes.h"
+#include "nsDataHashtable.h"
+#include "harfbuzz/hb.h"
 
 typedef struct _cairo_scaled_font cairo_scaled_font_t;
 typedef struct gr_face            gr_face;
@@ -62,6 +58,12 @@ class nsILanguageAtomService;
 struct FontListSizes;
 struct gfxTextRunDrawCallbacks;
 
+namespace mozilla {
+namespace gfx {
+class GlyphRenderingOptions;
+}
+}
+
 struct gfxFontStyle {
     gfxFontStyle();
     gfxFontStyle(uint8_t aStyle, uint16_t aWeight, int16_t aStretch,

gfx/thebes/gfxFontFeatures.h

@@ -7,7 +7,6 @@
 #ifndef GFX_FONT_FEATURES_H
 #define GFX_FONT_FEATURES_H
 
-#include "gfxTypes.h"
 #include "nsTHashtable.h"
 #include "nsTArray.h"
 #include "nsString.h"

gfx/thebes/gfxFontMissingGlyphs.cpp

@@ -5,6 +5,8 @@
 
 #include "gfxFontMissingGlyphs.h"
 #include "nsDeviceContext.h"
+#include "gfxContext.h"
+#include "gfxColor.h"
 
 #define CHAR_BITS(b00, b01, b02, b10, b11, b12, b20, b21, b22, b30, b31, b32, b40, b41, b42) \
   ((b00 << 0) | (b01 << 1) | (b02 << 2) | (b10 << 3) | (b11 << 4) | (b12 << 5) | \

gfx/thebes/gfxFontMissingGlyphs.h

@@ -7,9 +7,10 @@
 #define GFX_FONTMISSINGGLYPHS_H
 
 #include "gfxTypes.h"
-#include "gfxContext.h"
 #include "gfxRect.h"
 
+class gfxContext;
+
 /**
  * This class should not be instantiated. It's just a container
  * for some helper functions.

gfx/thebes/gfxFontTest.h

@@ -11,9 +11,6 @@
 
 #include "cairo/cairo.h"
 
-#include "gfxFont.h"
-#include "gfxUserFontSet.h"
-
 struct gfxFontTestItem {
     gfxFontTestItem(const nsCString& fontName,
                     cairo_glyph_t *cglyphs, int nglyphs)

gfx/thebes/gfxFontUtils.cpp

@@ -5,8 +5,8 @@
 
 #ifdef MOZ_LOGGING
 #define FORCE_PR_LOG /* Allow logging in the release build */
-#endif
 #include "prlog.h"
+#endif
 
 #include "mozilla/Util.h"
 
@@ -17,7 +17,6 @@
 #include "mozilla/Preferences.h"
 
 #include "nsIUUIDGenerator.h"
-#include "nsMemory.h"
 #include "nsICharsetConverterManager.h"
 
 #include "harfbuzz/hb.h"
@@ -25,10 +24,6 @@
 #include "plbase64.h"
 #include "prlog.h"
 
-#ifdef XP_MACOSX
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
 #ifdef PR_LOGGING
 
 #define LOG(log, args) PR_LOG(gfxPlatform::GetLog(log), \

gfx/thebes/gfxFontUtils.h

@@ -6,14 +6,7 @@
 #ifndef GFX_FONT_UTILS_H
 #define GFX_FONT_UTILS_H
 
-#include "gfxTypes.h"
 #include "gfxPlatform.h"
-
-#include "nsAlgorithm.h"
-#include "prcpucfg.h"
-
-#include "nsDataHashtable.h"
-
 #include "nsITimer.h"
 #include "nsCOMPtr.h"
 #include "nsComponentManagerUtils.h"

gfx/thebes/gfxFontconfigUtils.cpp

@@ -19,6 +19,8 @@
 
 #include "nsIAtom.h"
 #include "nsCRT.h"
+#include "gfxFontConstants.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla;
 

gfx/thebes/gfxGDIFont.cpp

@@ -16,6 +16,7 @@
 #include "gfxContext.h"
 #include "mozilla/Preferences.h"
 #include "nsUnicodeProperties.h"
+#include "gfxFontConstants.h"
 
 #include "cairo-win32.h"
 

gfx/thebes/gfxGDIFontList.cpp

@@ -26,6 +26,7 @@
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIWindowsRegKey.h"
+#include "gfxFontConstants.h"
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Telemetry.h"

gfx/thebes/gfxGraphiteShaper.cpp

@@ -3,27 +3,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsString.h"
-#include "nsBidiUtils.h"
-#include "nsMathUtils.h"
-
-#include "gfxTypes.h"
-
-#include "gfxContext.h"
-#include "gfxPlatform.h"
 #include "gfxGraphiteShaper.h"
-#include "gfxFontUtils.h"
+#include "nsString.h"
+#include "gfxContext.h"
 
 #include "graphite2/Font.h"
 #include "graphite2/Segment.h"
 
 #include "harfbuzz/hb.h"
 
-#include "cairo.h"
-
-#include "nsUnicodeRange.h"
-#include "nsCRT.h"
-
 #define FloatToFixed(f) (65536 * (f))
 #define FixedToFloat(f) ((f) * (1.0 / 65536.0))
 // Right shifts of negative (signed) integers are undefined, as are overflows

gfx/thebes/gfxGraphiteShaper.h

@@ -6,10 +6,7 @@
 #ifndef GFX_GRAPHITESHAPER_H
 #define GFX_GRAPHITESHAPER_H
 
-#include "gfxTypes.h"
 #include "gfxFont.h"
-#include "nsDataHashtable.h"
-#include "nsHashKeys.h"
 
 struct gr_face;
 struct gr_font;

gfx/thebes/gfxHarfBuzzShaper.cpp

@@ -3,15 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsAlgorithm.h"
 #include "nsString.h"
-#include "nsBidiUtils.h"
-#include "nsMathUtils.h"
-
-#include "gfxTypes.h"
-
 #include "gfxContext.h"
-#include "gfxPlatform.h"
 #include "gfxHarfBuzzShaper.h"
 #include "gfxFontUtils.h"
 #include "nsUnicodeProperties.h"
@@ -21,9 +14,6 @@
 #include "harfbuzz/hb.h"
 #include "harfbuzz/hb-ot.h"
 
-#include "cairo.h"
-
-#include "nsCRT.h"
 #include <algorithm>
 
 #define FloatToFixed(f) (65536 * (f))

gfx/thebes/gfxHarfBuzzShaper.h

@@ -6,10 +6,7 @@
 #ifndef GFX_HARFBUZZSHAPER_H
 #define GFX_HARFBUZZSHAPER_H
 
-#include "gfxTypes.h"
 #include "gfxFont.h"
-#include "nsDataHashtable.h"
-#include "nsPoint.h"
 
 #include "harfbuzz/hb.h"
 

gfx/thebes/gfxImageSurface.cpp

@@ -5,7 +5,9 @@
 
 
 #include "mozilla/MemoryReporting.h"
+#if defined(HAVE_POSIX_MEMALIGN)
 #include "gfxAlphaRecovery.h"
+#endif
 #include "gfxImageSurface.h"
 
 #include "cairo.h"

gfx/thebes/gfxImageSurface.h

@@ -9,7 +9,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "gfxASurface.h"
 #include "nsAutoPtr.h"
-#include "gfxPoint.h"
+#include "nsSize.h"
 
 // ARGB -- raw buffer.. wont be changed.. good for storing data.
 

gfx/thebes/gfxMacFont.cpp

@@ -14,6 +14,8 @@
 #include "gfxPlatformMac.h"
 #include "gfxContext.h"
 #include "gfxFontUtils.h"
+#include "gfxMacPlatformFontList.h"
+#include "gfxFontConstants.h"
 
 #include "cairo-quartz.h"
 

gfx/thebes/gfxMacFont.h

@@ -8,10 +8,10 @@
 
 #include "mozilla/MemoryReporting.h"
 #include "gfxFont.h"
-#include "gfxMacPlatformFontList.h"
-#include "mozilla/gfx/2D.h"
-
 #include "cairo.h"
+#include <ApplicationServices/ApplicationServices.h>
+
+class MacOSFontEntry;
 
 class gfxMacFont : public gfxFont
 {

gfx/thebes/gfxMacPlatformFontList.mm

@@ -62,10 +62,12 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsISimpleEnumerator.h"
 #include "nsCharTraits.h"
+#include "gfxFontConstants.h"
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/gfx/2D.h"
 
 #include <unistd.h>
 #include <time.h>

gfx/thebes/gfxMatrix.h

@@ -9,7 +9,6 @@
 #include "gfxPoint.h"
 #include "gfxTypes.h"
 #include "gfxRect.h"
-#include "nsMathUtils.h"
 
 // XX - I don't think this class should use gfxFloat at all,
 // but should use 'double' and be called gfxDoubleMatrix;

gfx/thebes/gfxPangoFonts.cpp

@@ -29,6 +29,7 @@
 #include "nsUnicodeScriptCodes.h"
 #include "gfxFontconfigUtils.h"
 #include "gfxUserFontSet.h"
+#include "gfxFontConstants.h"
 
 #include <cairo.h>
 #include <cairo-ft.h>

gfx/thebes/gfxPattern.cpp

@@ -7,6 +7,7 @@
 #include "gfxPattern.h"
 #include "gfxASurface.h"
 #include "gfxPlatform.h"
+#include "gfx2DGlue.h"
 
 #include "cairo.h"
 

gfx/thebes/gfxPattern.h

@@ -8,16 +8,16 @@
 
 #include "gfxTypes.h"
 
-#include "gfxColor.h"
 #include "gfxMatrix.h"
-#include "nsISupportsImpl.h"
-#include "nsAutoPtr.h"
 #include "mozilla/Alignment.h"
 #include "mozilla/gfx/2D.h"
 #include "GraphicsFilter.h"
+#include "nsISupportsImpl.h"
+#include "nsAutoPtr.h"
 
 class gfxContext;
 class gfxASurface;
+struct gfxRGBA;
 typedef struct _cairo_pattern cairo_pattern_t;
 
 

gfx/thebes/gfxPlatform.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/layers/ImageBridgeChild.h"
 
 #include "prlog.h"
-#include "prenv.h"
 
 #include "gfxPlatform.h"
 
@@ -38,17 +37,15 @@
 #include "gfxPlatformFontList.h"
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
-#include "gfxUserFontSet.h"
 #include "nsUnicodeProperties.h"
 #include "harfbuzz/hb.h"
 #include "gfxGraphiteShaper.h"
+#include "gfx2DGlue.h"
 
 #include "nsUnicodeRange.h"
 #include "nsServiceManagerUtils.h"
 #include "nsTArray.h"
-#include "nsUnicharUtilCIID.h"
 #include "nsILocaleService.h"
-#include "nsReadableUtils.h"
 
 #include "nsWeakReference.h"
 
@@ -68,12 +65,6 @@
 #include "skia/SkGraphics.h"
 #endif
 
-#ifdef USE_SKIA_GPU
-#include "skia/GrContext.h"
-#include "skia/GrGLInterface.h"
-#include "GLContextSkia.h"
-#endif
-
 #include "mozilla/Preferences.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"

gfx/thebes/gfxPlatform.h

@@ -9,18 +9,14 @@
 #include "prlog.h"
 #include "nsTArray.h"
 #include "nsString.h"
-#include "nsIObserver.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
 
 #include "gfxTypes.h"
-#include "gfxColor.h"
 #include "nsRect.h"
 
 #include "qcms.h"
 
-#include "mozilla/gfx/2D.h"
-#include "gfx2DGlue.h"
 #include "mozilla/RefPtr.h"
 #include "GfxInfoCollector.h"
 
@@ -42,11 +38,19 @@ class gfxPlatformFontList;
 class gfxTextRun;
 class nsIURI;
 class nsIAtom;
+class nsIObserver;
+struct gfxRGBA;
 
 namespace mozilla {
 namespace gl {
 class GLContext;
 }
+namespace gfx {
+class DrawTarget;
+class SourceSurface;
+class ScaledFont;
+class DrawEventRecorder;
+}
 }
 
 extern cairo_user_data_key_t kDrawTarget;

gfx/thebes/gfxPlatformFontList.cpp

@@ -20,6 +20,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla;
 

gfx/thebes/gfxPlatformMac.cpp

@@ -9,20 +9,16 @@
 #include "gfxQuartzSurface.h"
 #include "gfxQuartzImageSurface.h"
 #include "mozilla/gfx/2D.h"
-#include "mozilla/gfx/QuartzSupport.h"
 
 #include "gfxMacPlatformFontList.h"
 #include "gfxMacFont.h"
 #include "gfxCoreTextShaper.h"
 #include "gfxUserFontSet.h"
 
-#include "nsCRT.h"
 #include "nsTArray.h"
-#include "nsUnicodeRange.h"
-
 #include "mozilla/Preferences.h"
-
 #include "qcms.h"
+#include "gfx2DGlue.h"
 
 #include <dlfcn.h>
 

gfx/thebes/gfxPlatformMac.h

@@ -6,7 +6,7 @@
 #ifndef GFX_PLATFORM_MAC_H
 #define GFX_PLATFORM_MAC_H
 
-#include "nsTArray.h"
+#include "nsTArrayForwardDeclare.h"
 #include "gfxPlatform.h"
 
 #define MAC_OS_X_VERSION_10_6_HEX 0x00001060
@@ -14,9 +14,6 @@
 
 #define MAC_OS_X_MAJOR_VERSION_MASK 0xFFFFFFF0U
 
-class gfxTextRun;
-class gfxFontFamily;
-
 namespace mozilla { namespace gfx { class DrawTarget; }}
 
 class gfxPlatformMac : public gfxPlatform {

gfx/thebes/gfxQuartzImageSurface.cpp

@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "gfxQuartzImageSurface.h"
+#include "gfxImageSurface.h"
 
-#include "cairo-quartz.h"
 #include "cairo-quartz-image.h"
 
 gfxQuartzImageSurface::gfxQuartzImageSurface(gfxImageSurface *imageSurface)

gfx/thebes/gfxQuartzImageSurface.h

@@ -7,7 +7,9 @@
 #define GFX_QUARTZIMAGESURFACE_H
 
 #include "gfxASurface.h"
-#include "gfxImageSurface.h"
+#include "nsSize.h"
+
+class gfxImageSurface;
 
 class gfxQuartzImageSurface : public gfxASurface {
 public:

gfx/thebes/gfxQuartzNativeDrawing.cpp

@@ -3,8 +3,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsMathUtils.h"
-
 #include "gfxQuartzNativeDrawing.h"
 #include "gfxQuartzSurface.h"
 #include "cairo-quartz.h"

gfx/thebes/gfxQuartzNativeDrawing.h

@@ -11,6 +11,7 @@
 #include "gfxContext.h"
 #include "gfxQuartzSurface.h"
 #include "mozilla/gfx/BorrowedContext.h"
+#include "nsAutoPtr.h"
 
 class gfxQuartzNativeDrawing {
 public:

gfx/thebes/gfxQuartzSurface.cpp

@@ -5,6 +5,7 @@
 
 #include "gfxQuartzSurface.h"
 #include "gfxContext.h"
+#include "gfxImageSurface.h"
 
 #include "cairo-quartz.h"
 

gfx/thebes/gfxQuartzSurface.h

@@ -7,11 +7,13 @@
 #define GFX_QUARTZSURFACE_H
 
 #include "gfxASurface.h"
-#include "gfxImageSurface.h"
+#include "nsSize.h"
+#include "gfxPoint.h"
 
 #include <Carbon/Carbon.h>
 
 class gfxContext;
+class gfxImageSurface;
 
 class gfxQuartzSurface : public gfxASurface {
 public:

gfx/thebes/gfxRect.h

@@ -6,10 +6,8 @@
 #ifndef GFX_RECT_H
 #define GFX_RECT_H
 
-#include "nsAlgorithm.h"
 #include "gfxTypes.h"
 #include "gfxPoint.h"
-#include "gfxCore.h"
 #include "nsDebug.h"
 #include "nsRect.h"
 #include "mozilla/gfx/BaseMargin.h"

gfx/thebes/gfxReusableSharedImageSurfaceWrapper.cpp

@@ -4,6 +4,7 @@
 
 #include "gfxReusableSharedImageSurfaceWrapper.h"
 #include "gfxSharedImageSurface.h"
+#include "mozilla/layers/ISurfaceAllocator.h"
 
 using mozilla::ipc::Shmem;
 using mozilla::layers::ISurfaceAllocator;

gfx/thebes/gfxReusableSharedImageSurfaceWrapper.h

@@ -6,10 +6,18 @@
 #define GFXSHMCOWSURFACEWRAPPER
 
 #include "gfxReusableSurfaceWrapper.h"
-#include "mozilla/layers/ISurfaceAllocator.h"
 
 class gfxSharedImageSurface;
 
+namespace mozilla {
+namespace ipc {
+class Shmem;
+}
+namespace layers {
+class ISurfaceAllocator;
+}
+}
+
 /**
  * A cross-process capable implementation of gfxReusableSurfaceWrapper based
  * on gfxSharedImageSurface.

gfx/thebes/gfxSVGGlyphs.cpp

@@ -4,12 +4,8 @@
 
 #include "gfxSVGGlyphs.h"
 
-#include "nscore.h"
 #include "nsError.h"
-#include "nsAutoPtr.h"
-#include "nsIParser.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMNodeList.h"
 #include "nsString.h"
 #include "nsIDocument.h"
 #include "nsICategoryManager.h"
@@ -18,9 +14,6 @@
 #include "nsIStreamListener.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIPresShell.h"
-#include "nsQueryFrame.h"
-#include "nsIContentSink.h"
-#include "nsXMLContentSink.h"
 #include "nsNetUtil.h"
 #include "nsIInputStream.h"
 #include "nsStringStream.h"
@@ -33,6 +26,8 @@
 #include "nsContentUtils.h"
 #include "gfxFont.h"
 #include "nsSMILAnimationController.h"
+#include "gfxContext.h"
+#include "gfxColor.h"
 #include "harfbuzz/hb.h"
 
 #define SVG_CONTENT_TYPE NS_LITERAL_CSTRING("image/svg+xml")

gfx/thebes/gfxSVGGlyphs.h

@@ -7,20 +7,26 @@
 
 #include "gfxFontUtils.h"
 #include "nsString.h"
-#include "nsIDocument.h"
 #include "nsAutoPtr.h"
-#include "nsIContentViewer.h"
-#include "nsIPresShell.h"
 #include "nsClassHashtable.h"
 #include "nsBaseHashtable.h"
 #include "nsHashKeys.h"
 #include "gfxPattern.h"
-#include "gfxFont.h"
 #include "mozilla/gfx/UserData.h"
 #include "nsRefreshDriver.h"
+#include "DrawMode.h"
 
+class nsIDocument;
+class nsIContentViewer;
+class nsIPresShell;
 class gfxSVGGlyphs;
+class gfxTextContextPaint;
 
+namespace mozilla {
+namespace dom {
+class Element;
+}
+}
 
 /**
  * Wraps an SVG document contained in the SVG table of an OpenType font.

gfx/thebes/gfxScriptItemizer.cpp

@@ -49,8 +49,8 @@
 
 #include "gfxScriptItemizer.h"
 #include "nsUnicodeProperties.h"
-
 #include "nsCharTraits.h"
+#include "harfbuzz/hb.h"
 
 #define MOD(sp) ((sp) % PAREN_STACK_DEPTH)
 #define LIMIT_INC(sp) (((sp) < PAREN_STACK_DEPTH)? (sp) + 1 : PAREN_STACK_DEPTH)

gfx/thebes/gfxScriptItemizer.h

@@ -52,7 +52,6 @@
 
 #include <stdint.h>
 #include "prtypes.h"
-#include "harfbuzz/hb.h"
 #include "nsUnicodeScriptCodes.h"
 
 #define PAREN_STACK_DEPTH 32

gfx/thebes/gfxSkipChars.h

@@ -8,7 +8,6 @@
 
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
-#include "gfxTypes.h"
 
 /*
  * gfxSkipChars is a data structure representing a list of characters that

gfx/thebes/gfxTeeSurface.cpp

@@ -5,6 +5,7 @@
 
 #include "gfxTeeSurface.h"
 #include "nsAutoPtr.h"
+#include "nsTArray.h"
 
 #include "cairo-tee.h"
 

gfx/thebes/gfxTeeSurface.h

@@ -7,9 +7,11 @@
 #define GFX_TEESURFACE_H
 
 #include "gfxASurface.h"
-#include "nsTArray.h"
+#include "nsTArrayForwardDeclare.h"
 #include "nsSize.h"
 
+template<class T> class nsRefPtr;
+
 /**
  * Wraps a cairo_tee_surface. The first surface in the surface list is the
  * primary surface, which answers all surface queries (including size).

gfx/thebes/gfxUserFontSet.cpp

@@ -10,14 +10,14 @@
 
 #include "gfxUserFontSet.h"
 #include "gfxPlatform.h"
-#include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsNetUtil.h"
 #include "nsICacheService.h"
 #include "nsIProtocolHandler.h"
 #include "nsIPrincipal.h"
+#include "gfxFontConstants.h"
 #include "mozilla/Services.h"
-#include "mozilla/Telemetry.h"
+#include "mozilla/gfx/2D.h"
 
 #include "opentype-sanitiser.h"
 #include "ots-memory-stream.h"

gfx/thebes/gfxUserFontSet.h

@@ -6,20 +6,15 @@
 #ifndef GFX_USER_FONT_SET_H
 #define GFX_USER_FONT_SET_H
 
-#include "gfxTypes.h"
 #include "gfxFont.h"
-#include "gfxFontUtils.h"
 #include "nsRefPtrHashtable.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
 #include "nsIURI.h"
-#include "nsIFile.h"
 #include "nsIPrincipal.h"
-#include "nsISupportsImpl.h"
 #include "nsIScriptError.h"
 #include "nsURIHashKey.h"
 
-class gfxMixedFontFamily;
 class nsFontFaceLoader;
 
 //#define DEBUG_USERFONT_CACHE

gfx/thebes/gfxUtils.h

@@ -8,8 +8,6 @@
 
 #include "gfxTypes.h"
 #include "GraphicsFilter.h"
-#include "gfxImageSurface.h"
-#include "mozilla/gfx/2D.h"
 #include "imgIContainer.h"
 
 class gfxDrawable;

gfx/thebes/gfxWindowsPlatform.cpp

@@ -40,6 +40,7 @@
 
 #include "gfxUserFontSet.h"
 #include "nsWindowsHelpers.h"
+#include "gfx2DGlue.h"
 
 #include <string>
 

gfx/thebes/nsUnicodeRange.cpp

@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsUnicodeRange.h"
-#include "nsIAtom.h"
 #include "nsGkAtoms.h"
+#include "mozilla/NullPtr.h"
 
 // This table depends on unicode range definitions. 
 // Each item's index must correspond unicode range value

gfx/thebes/nsUnicodeRange.h

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nscore.h"
+#include <stdint.h>
 
 class nsIAtom;
 

image/src/imgFrame.h

@@ -22,6 +22,7 @@
 #endif
 #include "nsAutoPtr.h"
 #include "imgIContainer.h"
+#include "gfxColor.h"
 
 class imgFrame
 {

layout/base/nsCSSRendering.cpp

@@ -48,6 +48,7 @@
 #include "ImageContainer.h"
 #include "mozilla/Telemetry.h"
 #include "gfxUtils.h"
+#include "gfxColor.h"
 #include <algorithm>
 
 using namespace mozilla;

layout/base/nsPresContext.cpp

@@ -62,6 +62,8 @@
 #include "nsIImageLoadingContent.h"
 
 #include "nsCSSParser.h"
+#include "nsBidiUtils.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

layout/generic/nsTextRunTransformations.cpp

@@ -12,6 +12,7 @@
 #include "nsStyleContext.h"
 #include "nsUnicodeProperties.h"
 #include "nsSpecialCasingData.h"
+#include "mozilla/gfx/2D.h"
 
 // Unicode characters needing special casing treatment in tr/az languages
 #define LATIN_CAPITAL_LETTER_I_WITH_DOT_ABOVE  0x0130

layout/inspector/src/nsFontFace.cpp

@@ -8,6 +8,7 @@
 #include "gfxFont.h"
 #include "gfxUserFontSet.h"
 #include "nsFontFaceLoader.h"
+#include "mozilla/gfx/2D.h"
 #include "zlib.h"
 
 nsFontFace::nsFontFace(gfxFontEntry*      aFontEntry,

layout/inspector/src/nsFontFaceList.cpp

@@ -7,6 +7,7 @@
 #include "nsFontFaceLoader.h"
 #include "nsIFrame.h"
 #include "gfxFont.h"
+#include "mozilla/gfx/2D.h"
 
 nsFontFaceList::nsFontFaceList()
 {

layout/mathml/nsMathMLmactionFrame.cpp

@@ -14,6 +14,7 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsTextFragment.h"
 #include "nsIDOMEvent.h"
+#include "mozilla/gfx/2D.h"
 
 //
 // <maction> -- bind actions to a subexpression - implementation

layout/mathml/nsMathMLmpaddedFrame.cpp

@@ -6,6 +6,7 @@
 
 #include "nsMathMLmpaddedFrame.h"
 #include "nsMathMLElement.h"
+#include "mozilla/gfx/2D.h"
 #include <algorithm>
 
 //

layout/mathml/nsMathMLmphantomFrame.cpp

@@ -5,6 +5,7 @@
 
 
 #include "nsMathMLmphantomFrame.h"
+#include "mozilla/gfx/2D.h"
 
 //
 // <mphantom> -- make content invisible but preserve its size

layout/mathml/nsMathMLmrowFrame.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsMathMLmrowFrame.h"
+#include "mozilla/gfx/2D.h"
 
 //
 // <mrow> -- horizontally group any number of subexpressions - implementation

layout/mathml/nsMathMLmspaceFrame.cpp

@@ -5,6 +5,7 @@
 
 #include "nsMathMLmspaceFrame.h"
 #include "nsMathMLElement.h"
+#include "mozilla/gfx/2D.h"
 #include <algorithm>
 
 

layout/mathml/nsMathMLmsqrtFrame.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsMathMLmsqrtFrame.h"
+#include "mozilla/gfx/2D.h"
 
 //
 // <msqrt> -- form a radical - implementation

layout/mathml/nsMathMLmstyleFrame.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsMathMLmstyleFrame.h"
+#include "mozilla/gfx/2D.h"
 
 //
 // <mstyle> -- style change

layout/mathml/nsMathMLsemanticsFrame.cpp

@@ -6,6 +6,7 @@
 
 #include "nsMathMLsemanticsFrame.h"
 #include "nsMimeTypes.h"
+#include "mozilla/gfx/2D.h"
 
 //
 // <semantics> -- associate annotations with a MathML expression

layout/style/nsFontFaceLoader.cpp

@@ -34,6 +34,7 @@
 
 #include "nsStyleSet.h"
 #include "nsPrintfCString.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla;
 

layout/svg/nsSVGGradientFrame.cpp

@@ -14,6 +14,7 @@
 #include "nsContentUtils.h"
 #include "nsSVGEffects.h"
 #include "nsSVGAnimatedTransformList.h"
+#include "gfxColor.h"
 
 // XXX Tight coupling with content classes ahead!
 

layout/svg/nsSVGPatternFrame.cpp

@@ -22,6 +22,7 @@
 #include "nsSVGUtils.h"
 #include "nsSVGAnimatedTransformList.h"
 #include "SVGContentUtils.h"
+#include "gfxColor.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

layout/svg/nsSVGTextFrame2.h

@@ -18,6 +18,7 @@ class nsDisplaySVGText;
 class nsRenderingContext;
 class nsSVGTextFrame2;
 class nsTextFrame;
+class gfxFlattenedPath;
 
 typedef nsSVGDisplayContainerFrame nsSVGTextFrame2Base;
 

layout/svg/nsSVGUtils.cpp

@@ -53,6 +53,7 @@
 #include "nsTextFrame.h"
 #include "SVGContentUtils.h"
 #include "mozilla/unused.h"
+#include "gfx2DGlue.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

widget/android/nsLookAndFeel.cpp

@@ -8,6 +8,8 @@
 #include "nsXULAppAPI.h"
 #include "nsLookAndFeel.h"
 #include "gfxFont.h"
+#include "gfxFontConstants.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla;
 using mozilla::dom::ContentChild;