Bug 738929 - Speed up building of layout/svg/base/src by cleaning up #include directives in its source files. r=dholbert.

layout/svg/base/src/SVGFEContainerFrame.cpp

@@ -34,7 +34,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Keep in (case-insensitive) order:
 #include "nsContainerFrame.h"
+#include "nsGkAtoms.h"
+#include "nsIFrame.h"
+#include "nsLiteralString.h"
 #include "nsSVGEffects.h"
 #include "nsSVGFilters.h"
 

layout/svg/base/src/SVGFEImageFrame.cpp

@@ -34,11 +34,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Keep in (case-insensitive) order:
+#include "nsContentUtils.h"
 #include "nsFrame.h"
+#include "nsGkAtoms.h"
+#include "nsLiteralString.h"
 #include "nsSVGEffects.h"
 #include "nsSVGFilters.h"
-#include "nsContentUtils.h"
-#include "nsImageLoadingContent.h"
 
 using namespace mozilla;
 

layout/svg/base/src/SVGFELeafFrame.cpp

@@ -34,9 +34,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Keep in (case-insensitive) order:
 #include "nsFrame.h"
-#include "nsSVGFilters.h"
+#include "nsGkAtoms.h"
 #include "nsSVGEffects.h"
+#include "nsSVGFilters.h"
 
 typedef nsFrame SVGFELeafFrameBase;
 

layout/svg/base/src/SVGFEUnstyledLeafFrame.cpp

@@ -34,9 +34,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Keep in (case-insensitive) order:
 #include "nsFrame.h"
-#include "nsSVGFilters.h"
+#include "nsGkAtoms.h"
 #include "nsSVGEffects.h"
+#include "nsSVGFilters.h"
 
 typedef nsFrame SVGFEUnstyledLeafFrameBase;
 

layout/svg/base/src/nsSVGAFrame.cpp

@@ -36,12 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSVGTSpanFrame.h"
-#include "nsISVGGlyphFragmentNode.h"
-#include "nsSVGGraphicElement.h"
-#include "nsSVGAElement.h"
-#include "nsSVGUtils.h"
+// Keep in (case-insensitive) order:
 #include "gfxMatrix.h"
+#include "nsSVGAElement.h"
+#include "nsSVGTSpanFrame.h"
+#include "nsSVGUtils.h"
 #include "SVGLengthList.h"
 
 // <a> elements can contain text. nsSVGGlyphFrames expect to have

layout/svg/base/src/nsSVGClipPathFrame.cpp

@@ -34,17 +34,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGClipPathFrame.h"
 
-#include "nsIDOMDocument.h"
-#include "nsIDocument.h"
+// Keep others in (case-insensitive) order:
+#include "gfxContext.h"
+#include "nsGkAtoms.h"
 #include "nsIDOMSVGClipPathElement.h"
 #include "nsRenderingContext.h"
-#include "nsGkAtoms.h"
-#include "nsSVGUtils.h"
-#include "nsSVGEffects.h"
 #include "nsSVGClipPathElement.h"
-#include "gfxContext.h"
+#include "nsSVGEffects.h"
+#include "nsSVGUtils.h"
 
 //----------------------------------------------------------------------
 // Implementation

layout/svg/base/src/nsSVGContainerFrame.cpp

@@ -34,10 +34,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGContainerFrame.h"
+
+// Keep others in (case-insensitive) order:
 #include "nsSVGElement.h"
 #include "nsSVGUtils.h"
-#include "nsSVGOuterSVGFrame.h"
 
 NS_QUERYFRAME_HEAD(nsSVGContainerFrame)
   NS_QUERYFRAME_ENTRY(nsSVGContainerFrame)

layout/svg/base/src/nsSVGEffects.cpp

@@ -35,15 +35,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGEffects.h"
+
+// Keep others in (case-insensitive) order:
+#include "nsCSSFrameConstructor.h"
 #include "nsISupportsImpl.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsSVGFilterFrame.h"
 #include "nsSVGClipPathFrame.h"
+#include "nsSVGFilterFrame.h"
 #include "nsSVGMaskFrame.h"
 #include "nsSVGTextPathFrame.h"
-#include "nsCSSFrameConstructor.h"
-#include "nsFrameManager.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

layout/svg/base/src/nsSVGFilterFrame.cpp

@@ -34,23 +34,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGFilterFrame.h"
 
-#include "nsRenderingContext.h"
-#include "nsIDocument.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsGkAtoms.h"
-#include "nsSVGEffects.h"
-#include "nsSVGUtils.h"
-#include "nsSVGFilterElement.h"
-#include "nsSVGFilters.h"
+// Keep others in (case-insensitive) order:
 #include "gfxASurface.h"
-#include "gfxContext.h"
-#include "gfxImageSurface.h"
-#include "nsSVGFilterPaintCallback.h"
-#include "nsSVGRect.h"
-#include "nsSVGFilterInstance.h"
 #include "gfxUtils.h"
+#include "nsGkAtoms.h"
+#include "nsRenderingContext.h"
+#include "nsSVGEffects.h"
+#include "nsSVGFilterElement.h"
+#include "nsSVGFilterInstance.h"
+#include "nsSVGFilterPaintCallback.h"
+#include "nsSVGUtils.h"
 
 nsIFrame*
 NS_NewSVGFilterFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)

layout/svg/base/src/nsSVGFilterInstance.cpp

@@ -34,16 +34,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGFilterInstance.h"
 
-#include "nsRenderingContext.h"
-#include "nsSVGUtils.h"
-#include "nsIDOMSVGUnitTypes.h"
+// Keep others in (case-insensitive) order:
 #include "gfxPlatform.h"
-#include "nsSVGFilterPaintCallback.h"
-#include "nsSVGFilterElement.h"
-#include "nsLayoutUtils.h"
 #include "gfxUtils.h"
+#include "nsIDOMSVGUnitTypes.h"
+#include "nsRenderingContext.h"
+#include "nsSVGFilterElement.h"
+#include "nsSVGFilterPaintCallback.h"
+#include "nsSVGUtils.h"
 
 float
 nsSVGFilterInstance::GetPrimitiveNumber(PRUint8 aCtxType, float aValue) const

layout/svg/base/src/nsSVGForeignObjectFrame.cpp

@@ -36,24 +36,23 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGForeignObjectFrame.h"
 
-#include "nsIDOMSVGForeignObjectElem.h"
-#include "nsIDOMSVGSVGElement.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsRegion.h"
-#include "nsRenderingContext.h"
-#include "nsGkAtoms.h"
-#include "nsLayoutUtils.h"
-#include "nsSVGUtils.h"
-#include "nsIURI.h"
-#include "nsSVGRect.h"
-#include "nsINameSpaceManager.h"
-#include "nsSVGEffects.h"
-#include "nsSVGForeignObjectElement.h"
-#include "nsSVGContainerFrame.h"
+// Keep others in (case-insensitive) order:
 #include "gfxContext.h"
 #include "gfxMatrix.h"
+#include "nsGkAtoms.h"
+#include "nsIDOMSVGForeignObjectElem.h"
+#include "nsINameSpaceManager.h"
+#include "nsLayoutUtils.h"
+#include "nsRegion.h"
+#include "nsRenderingContext.h"
+#include "nsSVGContainerFrame.h"
+#include "nsSVGEffects.h"
+#include "nsSVGForeignObjectElement.h"
+#include "nsSVGOuterSVGFrame.h"
+#include "nsSVGUtils.h"
 
 //----------------------------------------------------------------------
 // Implementation

layout/svg/base/src/nsSVGGFrame.cpp

@@ -36,12 +36,15 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIDOMSVGTransformable.h"
+// Main header first:
 #include "nsSVGGFrame.h"
-#include "nsIFrame.h"
+
+// Keep others in (case-insensitive) order:
 #include "nsGkAtoms.h"
-#include "nsSVGUtils.h"
+#include "nsIDOMSVGTransformable.h"
+#include "nsIFrame.h"
 #include "nsSVGGraphicElement.h"
+#include "nsSVGUtils.h"
 
 //----------------------------------------------------------------------
 // Implementation

layout/svg/base/src/nsSVGGenericContainerFrame.cpp

@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGGenericContainerFrame.h"
-#include "nsSVGUtils.h"
 
 //----------------------------------------------------------------------
 // nsSVGGenericContainerFrame Implementation

layout/svg/base/src/nsSVGGeometryFrame.cpp

@@ -34,14 +34,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
+#include "nsSVGGeometryFrame.h"
+
+// Keep others in (case-insensitive) order:
+#include "gfxContext.h"
 #include "nsPresContext.h"
+#include "nsSVGEffects.h"
+#include "nsSVGPaintServerFrame.h"
 #include "nsSVGPathElement.h"
 #include "nsSVGUtils.h"
-#include "nsSVGGeometryFrame.h"
-#include "nsSVGPaintServerFrame.h"
-#include "nsContentUtils.h"
-#include "gfxContext.h"
-#include "nsSVGEffects.h"
 
 NS_IMPL_FRAMEARENA_HELPERS(nsSVGGeometryFrame)
 

layout/svg/base/src/nsSVGGlyphFrame.cpp

@@ -36,27 +36,26 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGGlyphFrame.h"
 
-#include "nsRenderingContext.h"
-#include "nsSVGTextFrame.h"
-#include "mozilla/LookAndFeel.h"
-#include "nsTextFragment.h"
-#include "nsBidiPresUtils.h"
-#include "nsSVGUtils.h"
-#include "SVGLengthList.h"
-#include "nsIDOMSVGLength.h"
-#include "nsIDOMSVGRect.h"
+// Keep others in (case-insensitive) order:
 #include "DOMSVGPoint.h"
-#include "nsSVGTextPathFrame.h"
-#include "nsSVGPathElement.h"
-#include "nsSVGRect.h"
-#include "nsDOMError.h"
 #include "gfxContext.h"
 #include "gfxMatrix.h"
 #include "gfxPlatform.h"
+#include "mozilla/LookAndFeel.h"
+#include "nsBidiPresUtils.h"
+#include "nsDOMError.h"
+#include "nsIDOMSVGRect.h"
+#include "nsRenderingContext.h"
 #include "nsSVGEffects.h"
 #include "nsSVGPaintServerFrame.h"
+#include "nsSVGRect.h"
+#include "nsSVGTextPathFrame.h"
+#include "nsSVGUtils.h"
+#include "nsTextFragment.h"
+#include "SVGLengthList.h"
 
 using namespace mozilla;
 

layout/svg/base/src/nsSVGGradientFrame.cpp

@@ -37,17 +37,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIDOMSVGAnimatedNumber.h"
-#include "nsIDOMSVGAnimTransformList.h"
-#include "SVGAnimatedTransformList.h"
-#include "nsSVGEffects.h"
-#include "nsIDOMSVGStopElement.h"
-#include "nsSVGGradientElement.h"
-#include "nsSVGGeometryFrame.h"
+// Main header first:
 #include "nsSVGGradientFrame.h"
-#include "gfxContext.h"
+
+// Keep others in (case-insensitive) order:
 #include "gfxPattern.h"
 #include "nsContentUtils.h"
+#include "nsIDOMSVGAnimatedNumber.h"
+#include "nsIDOMSVGStopElement.h"
+#include "nsSVGEffects.h"
+#include "nsSVGGradientElement.h"
+#include "SVGAnimatedTransformList.h"
 
 using mozilla::SVGAnimatedTransformList;
 

layout/svg/base/src/nsSVGImageFrame.cpp

@@ -34,26 +34,23 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSVGPathGeometryFrame.h"
-
-#include "nsRenderingContext.h"
-#include "imgIContainer.h"
-#include "nsStubImageDecoderObserver.h"
-#include "nsImageLoadingContent.h"
-#include "nsIDOMSVGImageElement.h"
-#include "nsLayoutUtils.h"
-#include "nsSVGEffects.h"
-#include "nsSVGImageElement.h"
-#include "nsSVGUtils.h"
+// Keep in (case-insensitive) order:
 #include "gfxContext.h"
 #include "gfxMatrix.h"
-#include "nsIInterfaceRequestorUtils.h"
 #include "gfxPlatform.h"
+#include "imgIContainer.h"
+#include "nsIDOMSVGImageElement.h"
+#include "nsLayoutUtils.h"
+#include "nsRenderingContext.h"
+#include "nsStubImageDecoderObserver.h"
+#include "nsSVGEffects.h"
+#include "nsSVGImageElement.h"
+#include "nsSVGPathGeometryFrame.h"
 #include "nsSVGSVGElement.h"
+#include "nsSVGUtils.h"
 
 using namespace mozilla;
 
-class nsRenderingContext;
 class nsSVGImageFrame;
 
 class nsSVGImageListener MOZ_FINAL : public nsStubImageDecoderObserver

layout/svg/base/src/nsSVGInnerSVGFrame.cpp

@@ -36,15 +36,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGInnerSVGFrame.h"
 
-#include "nsRenderingContext.h"
+// Keep others in (case-insensitive) order:
+#include "gfxContext.h"
 #include "nsIFrame.h"
 #include "nsISVGChildFrame.h"
-#include "nsIDOMSVGAnimatedRect.h"
-#include "nsSVGSVGElement.h"
+#include "nsRenderingContext.h"
 #include "nsSVGContainerFrame.h"
-#include "gfxContext.h"
+#include "nsSVGSVGElement.h"
 
 nsIFrame*
 NS_NewSVGInnerSVGFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)

layout/svg/base/src/nsSVGIntegrationUtils.cpp

@@ -35,21 +35,21 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGIntegrationUtils.h"
 
-#include "nsRenderingContext.h"
-#include "nsSVGUtils.h"
-#include "nsSVGEffects.h"
-#include "nsRegion.h"
-#include "nsLayoutUtils.h"
-#include "nsDisplayList.h"
-#include "nsSVGFilterPaintCallback.h"
-#include "nsSVGFilterFrame.h"
-#include "nsSVGClipPathFrame.h"
-#include "nsSVGMaskFrame.h"
-#include "gfxPlatform.h"
+// Keep others in (case-insensitive) order:
 #include "gfxDrawable.h"
+#include "nsDisplayList.h"
+#include "nsLayoutUtils.h"
+#include "nsRenderingContext.h"
+#include "nsSVGClipPathFrame.h"
+#include "nsSVGEffects.h"
+#include "nsSVGFilterFrame.h"
+#include "nsSVGFilterPaintCallback.h"
+#include "nsSVGMaskFrame.h"
 #include "nsSVGPaintServerFrame.h"
+#include "nsSVGUtils.h"
 
 // ----------------------------------------------------------------------
 

layout/svg/base/src/nsSVGLeafFrame.cpp

@@ -34,9 +34,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Keep in (case-insensitive) order:
 #include "nsFrame.h"
 #include "nsSVGEffects.h"
-#include "nsImageLoadingContent.h"
 
 class nsSVGLeafFrame : public nsFrame
 {

layout/svg/base/src/nsSVGMarkerFrame.cpp

@@ -34,17 +34,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGMarkerFrame.h"
 
-#include "nsIDOMSVGAnimatedRect.h"
-#include "nsIDOMSVGRect.h"
-#include "nsIDocument.h"
+// Keep others in (case-insensitive) order:
+#include "gfxContext.h"
 #include "nsRenderingContext.h"
-#include "nsSVGPathGeometryFrame.h"
 #include "nsSVGEffects.h"
 #include "nsSVGMarkerElement.h"
 #include "nsSVGPathGeometryElement.h"
-#include "gfxContext.h"
+#include "nsSVGPathGeometryFrame.h"
 
 nsIFrame*
 NS_NewSVGMarkerFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)

layout/svg/base/src/nsSVGMaskFrame.cpp

@@ -34,15 +34,15 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGMaskFrame.h"
 
-#include "nsIDocument.h"
-#include "nsRenderingContext.h"
-#include "nsSVGContainerFrame.h"
-#include "nsSVGMaskElement.h"
-#include "nsSVGEffects.h"
+// Keep others in (case-insensitive) order:
 #include "gfxContext.h"
 #include "gfxImageSurface.h"
+#include "nsRenderingContext.h"
+#include "nsSVGEffects.h"
+#include "nsSVGMaskElement.h"
 
 //----------------------------------------------------------------------
 // Implementation

layout/svg/base/src/nsSVGOuterSVGFrame.cpp

@@ -36,25 +36,22 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGOuterSVGFrame.h"
 
+// Keep others in (case-insensitive) order:
+#include "DOMSVGTests.h"
+#include "gfxMatrix.h"
+#include "nsDisplayList.h"
+#include "nsIDocument.h"
 #include "nsIDOMSVGSVGElement.h"
+#include "nsIDOMWindow.h"
+#include "nsIInterfaceRequestorUtils.h"
+#include "nsIObjectLoadingContent.h"
 #include "nsRenderingContext.h"
+#include "nsStubMutationObserver.h"
 #include "nsSVGSVGElement.h"
 #include "nsSVGTextFrame.h"
-#include "DOMSVGTests.h"
-#include "nsDisplayList.h"
-#include "nsStubMutationObserver.h"
-#include "gfxContext.h"
-#include "gfxMatrix.h"
-#include "gfxRect.h"
-#include "nsIContentViewer.h"
-#include "nsIDocShell.h"
-#include "nsIDOMDocument.h"
-#include "nsIDOMWindow.h"
-#include "nsPIDOMWindow.h"
-#include "nsIObjectLoadingContent.h"
-#include "nsIInterfaceRequestorUtils.h"
 
 namespace dom = mozilla::dom;
 

layout/svg/base/src/nsSVGPaintServerFrame.cpp

@@ -34,7 +34,10 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGPaintServerFrame.h"
+
+// Keep others in (case-insensitive) order:
 #include "nsSVGGeometryFrame.h"
 
 NS_IMPL_FRAMEARENA_HELPERS(nsSVGPaintServerFrame)

layout/svg/base/src/nsSVGPathGeometryFrame.cpp

@@ -36,19 +36,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGPathGeometryFrame.h"
 
-#include "nsGkAtoms.h"
-#include "nsRenderingContext.h"
-#include "nsSVGMarkerFrame.h"
-#include "nsSVGUtils.h"
-#include "nsSVGEffects.h"
-#include "nsSVGGraphicElement.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsSVGRect.h"
-#include "nsSVGPathGeometryElement.h"
+// Keep others in (case-insensitive) order:
 #include "gfxContext.h"
 #include "gfxPlatform.h"
+#include "nsGkAtoms.h"
+#include "nsRenderingContext.h"
+#include "nsSVGEffects.h"
+#include "nsSVGGraphicElement.h"
+#include "nsSVGMarkerFrame.h"
+#include "nsSVGPathGeometryElement.h"
+#include "nsSVGUtils.h"
 
 //----------------------------------------------------------------------
 // Implementation

layout/svg/base/src/nsSVGPatternFrame.cpp

@@ -36,26 +36,24 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGPatternFrame.h"
 
-#include "nsGkAtoms.h"
-#include "nsIDOMSVGAnimatedRect.h"
-#include "nsRenderingContext.h"
-#include "SVGAnimatedTransformList.h"
-#include "nsStyleContext.h"
-#include "nsINameSpaceManager.h"
-#include "nsISVGChildFrame.h"
-#include "nsSVGRect.h"
-#include "nsSVGUtils.h"
-#include "nsSVGEffects.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsSVGPatternElement.h"
-#include "nsSVGGeometryFrame.h"
+// Keep others in (case-insensitive) order:
 #include "gfxContext.h"
-#include "gfxPlatform.h"
-#include "gfxPattern.h"
 #include "gfxMatrix.h"
+#include "gfxPattern.h"
+#include "gfxPlatform.h"
 #include "nsContentUtils.h"
+#include "nsGkAtoms.h"
+#include "nsISVGChildFrame.h"
+#include "nsRenderingContext.h"
+#include "nsStyleContext.h"
+#include "nsSVGEffects.h"
+#include "nsSVGGeometryFrame.h"
+#include "nsSVGPatternElement.h"
+#include "nsSVGUtils.h"
+#include "SVGAnimatedTransformList.h"
 
 using namespace mozilla;
 

layout/svg/base/src/nsSVGStopFrame.cpp

@@ -36,10 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIDOMSVGStopElement.h"
-#include "nsStyleContext.h"
+// Keep in (case-insensitive) order:
 #include "nsFrame.h"
 #include "nsGkAtoms.h"
+#include "nsIDOMSVGStopElement.h"
+#include "nsStyleContext.h"
 #include "nsSVGEffects.h"
 
 // This is a very simple frame whose only purpose is to capture style change

layout/svg/base/src/nsSVGSwitchFrame.cpp

@@ -36,12 +36,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSVGEffects.h"
+// Keep in (case-insensitive) order:
+#include "gfxMatrix.h"
+#include "gfxRect.h"
 #include "nsSVGGFrame.h"
 #include "nsSVGSwitchElement.h"
 #include "nsSVGUtils.h"
-#include "gfxRect.h"
-#include "gfxMatrix.h"
 
 class nsRenderingContext;
 

layout/svg/base/src/nsSVGTSpanFrame.cpp

@@ -36,12 +36,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
+#include "nsSVGTSpanFrame.h"
+
+// Keep others in (case-insensitive) order:
 #include "nsIDOMSVGTSpanElement.h"
 #include "nsIDOMSVGAltGlyphElement.h"
-#include "nsSVGTSpanFrame.h"
 #include "nsSVGUtils.h"
-#include "nsSVGTextFrame.h"
-#include "nsSVGOuterSVGFrame.h"
 
 //----------------------------------------------------------------------
 // Implementation

layout/svg/base/src/nsSVGTextContainerFrame.cpp

@@ -34,18 +34,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGContainerFrame.h"
+
+// Keep others in (case-insensitive) order:
+#include "nsDOMError.h"
+#include "nsSVGGlyphFrame.h"
 #include "nsSVGTextFrame.h"
 #include "nsSVGUtils.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsIDOMSVGTextElement.h"
-#include "nsIDOMSVGAnimatedLengthList.h"
 #include "SVGAnimatedNumberList.h"
-#include "SVGNumberList.h"
-#include "nsSVGGlyphFrame.h"
-#include "nsDOMError.h"
 #include "SVGLengthList.h"
-#include "nsSVGTextPositioningElement.h"
+#include "SVGNumberList.h"
 
 using namespace mozilla;
 

layout/svg/base/src/nsSVGTextFrame.cpp

@@ -36,21 +36,20 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsIDOMSVGTextElement.h"
+// Main header first:
 #include "nsSVGTextFrame.h"
-#include "SVGLengthList.h"
-#include "nsIDOMSVGLength.h"
-#include "nsIDOMSVGAnimatedNumber.h"
+
+// Keep others in (case-insensitive) order:
+#include "nsGkAtoms.h"
+#include "nsIDOMSVGRect.h"
+#include "nsIDOMSVGTextElement.h"
 #include "nsISVGGlyphFragmentNode.h"
 #include "nsSVGGlyphFrame.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsIDOMSVGRect.h"
-#include "nsSVGRect.h"
-#include "nsGkAtoms.h"
-#include "nsSVGTextPathFrame.h"
-#include "nsSVGPathElement.h"
-#include "nsSVGUtils.h"
 #include "nsSVGGraphicElement.h"
+#include "nsSVGPathElement.h"
+#include "nsSVGTextPathFrame.h"
+#include "nsSVGUtils.h"
+#include "SVGLengthList.h"
 
 using namespace mozilla;
 

layout/svg/base/src/nsSVGTextPathFrame.cpp

@@ -34,13 +34,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+// Main header first:
 #include "nsSVGTextPathFrame.h"
 
-#include "nsIDOMSVGTextPathElement.h"
-#include "nsSVGLength2.h"
-#include "nsIDOMSVGURIReference.h"
-#include "nsSVGEffects.h"
+// Keep others in (case-insensitive) order:
 #include "nsContentUtils.h"
+#include "nsIDOMSVGTextPathElement.h"
+#include "nsSVGEffects.h"
+#include "nsSVGLength2.h"
 #include "nsSVGPathElement.h"
 #include "nsSVGTextPathElement.h"
 #include "SVGLengthList.h"

layout/svg/base/src/nsSVGUseFrame.cpp

@@ -34,13 +34,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsSVGGFrame.h"
+// Keep in (case-insensitive) order:
 #include "nsIAnonymousContentCreator.h"
 #include "nsIDOMSVGUseElement.h"
-#include "nsIDOMSVGTransformable.h"
-#include "nsSVGElement.h"
+#include "nsSVGGFrame.h"
 #include "nsSVGUseElement.h"
-#include "gfxMatrix.h"
 
 typedef nsSVGGFrame nsSVGUseFrameBase;
 

layout/svg/base/src/nsSVGUtils.cpp

@@ -34,64 +34,53 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// include nsSVGUtils.h first to ensure definition of M_SQRT1_2 is picked up
+// Main header first:
+// This is also necessary to ensure our definition of M_SQRT1_2 is picked up
 #include "nsSVGUtils.h"
 
-#include "nsIDOMDocument.h"
-#include "nsIDOMSVGElement.h"
-#include "nsIDOMSVGSVGElement.h"
-#include "nsRenderingContext.h"
-#include "nsStyleCoord.h"
-#include "nsPresContext.h"
-#include "nsSVGSVGElement.h"
+// Keep others in (case-insensitive) order:
+#include "gfxContext.h"
+#include "gfxImageSurface.h"
+#include "gfxMatrix.h"
+#include "gfxPlatform.h"
+#include "gfxRect.h"
+#include "gfxUtils.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/Preferences.h"
+#include "nsComputedDOMStyle.h"
+#include "nsContentUtils.h"
+#include "nsFrameList.h"
+#include "nsGkAtoms.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsIFrame.h"
-#include "nsGkAtoms.h"
-#include "nsIURI.h"
-#include "nsStyleStruct.h"
-#include "nsIPresShell.h"
-#include "nsNetUtil.h"
-#include "nsFrameList.h"
-#include "nsISVGChildFrame.h"
-#include "nsContentDLF.h"
-#include "nsContentUtils.h"
-#include "nsSVGFilterFrame.h"
-#include "nsINameSpaceManager.h"
-#include "nsDOMError.h"
-#include "nsSVGOuterSVGFrame.h"
-#include "nsSVGInnerSVGFrame.h"
-#include "SVGAnimatedPreserveAspectRatio.h"
-#include "nsSVGClipPathFrame.h"
-#include "nsSVGMaskFrame.h"
-#include "nsSVGContainerFrame.h"
-#include "nsSVGTextContainerFrame.h"
-#include "nsSVGLength2.h"
-#include "nsGenericElement.h"
-#include "nsSVGGraphicElement.h"
-#include "nsAttrValue.h"
-#include "nsIScriptError.h"
-#include "gfxContext.h"
-#include "gfxMatrix.h"
-#include "gfxRect.h"
-#include "gfxImageSurface.h"
-#include "gfxPlatform.h"
-#include "nsSVGForeignObjectFrame.h"
+#include "nsIDOMSVGElement.h"
 #include "nsIDOMSVGUnitTypes.h"
+#include "nsIFrame.h"
+#include "nsINameSpaceManager.h"
+#include "nsIPresShell.h"
+#include "nsIScriptError.h"
+#include "nsISVGChildFrame.h"
+#include "nsPresContext.h"
+#include "nsRenderingContext.h"
+#include "nsStyleCoord.h"
+#include "nsStyleStruct.h"
+#include "nsSVGClipPathFrame.h"
+#include "nsSVGContainerFrame.h"
 #include "nsSVGEffects.h"
-#include "nsMathUtils.h"
-#include "nsSVGIntegrationUtils.h"
+#include "nsSVGFilterFrame.h"
 #include "nsSVGFilterPaintCallback.h"
+#include "nsSVGForeignObjectFrame.h"
 #include "nsSVGGeometryFrame.h"
-#include "nsComputedDOMStyle.h"
-#include "nsSVGPathGeometryFrame.h"
+#include "nsSVGInnerSVGFrame.h"
+#include "nsSVGIntegrationUtils.h"
+#include "nsSVGLength2.h"
+#include "nsSVGMaskFrame.h"
+#include "nsSVGOuterSVGFrame.h"
 #include "nsSVGPathGeometryElement.h"
-#include "prdtoa.h"
-#include "mozilla/dom/Element.h"
-#include "gfxUtils.h"
-#include "mozilla/Preferences.h"
-
-#include "mozilla/gfx/2D.h"
+#include "nsSVGPathGeometryFrame.h"
+#include "nsSVGSVGElement.h"
+#include "nsSVGTextContainerFrame.h"
+#include "SVGAnimatedPreserveAspectRatio.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;