Bug 174055, part 1: minimize inclusion of nsI(Thebes)FontMetrics.h.

accessible/src/html/nsHyperTextAccessible.cpp

@@ -58,7 +58,6 @@
 #include "nsIDOMXULDocument.h"
 #include "nsIEditingSession.h"
 #include "nsIEditor.h"
-#include "nsIFontMetrics.h"
 #include "nsIFrame.h"
 #include "nsFrameSelection.h"
 #include "nsILineIterator.h"

gfx/src/nsThebesDeviceContext.cpp

@@ -39,7 +39,6 @@
 
 #include "nsFont.h"
 #include "nsGfxCIID.h"
-#include "nsIThebesFontMetrics.h"
 #include "nsILanguageAtomService.h"
 #include "nsUnicharUtils.h"
 

layout/base/nsBidiPresUtils.cpp

@@ -55,7 +55,6 @@
 #include "nsContainerFrame.h"
 #include "nsFirstLetterFrame.h"
 #include "gfxUnicodeProperties.h"
-#include "nsIThebesFontMetrics.h"
 #include "nsTextFrame.h"
 
 #undef NOISY_BIDI

layout/base/nsCaret.cpp

@@ -51,7 +51,6 @@
 #include "nsIScrollableFrame.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMRange.h"
-#include "nsIFontMetrics.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
 #include "nsIDOMCharacterData.h"

layout/base/nsLayoutUtils.cpp

@@ -39,7 +39,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsLayoutUtils.h"
-#include "nsIFontMetrics.h"
 #include "nsIFormControlFrame.h"
 #include "nsPresContext.h"
 #include "nsIContent.h"

layout/forms/nsGfxButtonControlFrame.cpp

@@ -37,7 +37,6 @@
 
 #include "nsGfxButtonControlFrame.h"
 #include "nsWidgetsCID.h"
-#include "nsIFontMetrics.h"
 #include "nsFormControlFrame.h"
 #include "nsIFormControl.h"
 #include "nsINameSpaceManager.h"

layout/forms/nsImageControlFrame.cpp

@@ -47,7 +47,6 @@
 #include "nsISupports.h"
 #include "nsGkAtoms.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsStyleConsts.h"
 #include "nsFormControlFrame.h"
 #include "nsGUIEvent.h"

layout/forms/nsTextControlFrame.cpp

@@ -118,7 +118,6 @@
 #include "nsIJSContextStack.h"
 #include "nsFocusManager.h"
 #include "nsTextEditRules.h"
-#include "nsIFontMetrics.h"
 #include "nsIDOMNSHTMLElement.h"
 #include "nsPresState.h"
 

layout/generic/nsBRFrame.cpp

@@ -44,7 +44,6 @@
 #include "nsLineLayout.h"
 #include "nsStyleConsts.h"
 #include "nsGkAtoms.h"
-#include "nsIFontMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsLayoutUtils.h"
 

layout/generic/nsBlockFrame.cpp

@@ -61,7 +61,6 @@
 #include "nsIPresShell.h"
 #include "nsStyleContext.h"
 #include "nsIView.h"
-#include "nsIFontMetrics.h"
 #include "nsHTMLParts.h"
 #include "nsGkAtoms.h"
 #include "nsIDOMEvent.h"

layout/generic/nsBlockReflowContext.cpp

@@ -42,7 +42,6 @@
 #include "nsBlockReflowContext.h"
 #include "nsLineLayout.h"
 #include "nsFloatManager.h"
-#include "nsIFontMetrics.h"
 #include "nsPresContext.h"
 #include "nsFrameManager.h"
 #include "nsIContent.h"

layout/generic/nsBulletFrame.cpp

@@ -42,7 +42,6 @@
 #include "nsGkAtoms.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLContainerFrame.h"
-#include "nsIFontMetrics.h"
 #include "nsGenericHTMLElement.h"
 #include "nsPresContext.h"
 #include "nsIPresShell.h"

layout/generic/nsHTMLContainerFrame.cpp

@@ -61,8 +61,6 @@
 #include "nsWidgetsCID.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
-#include "nsIThebesFontMetrics.h"
 #include "gfxFont.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsDisplayList.h"

layout/generic/nsImageFrame.cpp

@@ -67,7 +67,6 @@
 #include "nsNetUtil.h"
 #include "nsHTMLContainerFrame.h"
 #include "prprf.h"
-#include "nsIFontMetrics.h"
 #include "nsCSSRendering.h"
 #include "nsILink.h"
 #include "nsIDOMHTMLAnchorElement.h"

layout/generic/nsInlineFrame.cpp

@@ -47,7 +47,6 @@
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsAutoPtr.h"

layout/generic/nsLineLayout.cpp

@@ -55,8 +55,6 @@
 #include "nsFloatManager.h"
 #include "nsStyleContext.h"
 #include "nsPresContext.h"
-#include "nsIFontMetrics.h"
-#include "nsIThebesFontMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsGkAtoms.h"
 #include "nsPlaceholderFrame.h"

layout/generic/nsPageFrame.cpp

@@ -53,7 +53,6 @@
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"
 #endif
-#include "nsIFontMetrics.h"
 #include "nsIPrintSettings.h"
 #include "nsRegion.h"
 

layout/generic/nsSimplePageSequence.cpp

@@ -43,7 +43,6 @@
 #include "nsGkAtoms.h"
 #include "nsIDeviceContext.h"
 #include "nsIPresShell.h"
-#include "nsIFontMetrics.h"
 #include "nsIPrintSettings.h"
 #include "nsPageFrame.h"
 #include "nsStyleConsts.h"

layout/generic/nsTextFrameThebes.cpp

@@ -63,7 +63,6 @@
 #include "nsStyleConsts.h"
 #include "nsStyleContext.h"
 #include "nsCoord.h"
-#include "nsIFontMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsIPresShell.h"
 #include "nsITimer.h"
@@ -110,7 +109,6 @@
 
 #include "nsBidiUtils.h"
 
-#include "nsIThebesFontMetrics.h"
 #include "gfxFont.h"
 #include "gfxContext.h"
 #include "gfxTextRunWordCache.h"

layout/mathml/nsMathMLChar.cpp

@@ -48,7 +48,6 @@
 #include "nsUnicharUtils.h"
 #include "nsRenderingContext.h"
 #include "gfxPlatform.h"
-#include "nsIFontMetrics.h"
 
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"

layout/mathml/nsMathMLContainerFrame.cpp

@@ -50,7 +50,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsIDOMText.h"
 #include "nsIDOMMutationEvent.h"

layout/mathml/nsMathMLForeignFrameWrapper.cpp

@@ -49,7 +49,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLForeignFrameWrapper.h"
 

layout/mathml/nsMathMLTokenFrame.cpp

@@ -42,7 +42,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 #include "nsContentUtils.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsMathMLTokenFrame.h"

layout/mathml/nsMathMLmactionFrame.cpp

@@ -42,7 +42,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIFontMetrics.h"
 
 #include "nsCSSRendering.h"
 #include "prprf.h"         // For PR_snprintf()

layout/mathml/nsMathMLmencloseFrame.cpp

@@ -48,7 +48,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 #include "nsWhitespaceTokenizer.h"
 
 #include "nsMathMLmencloseFrame.h"

layout/mathml/nsMathMLmfencedFrame.cpp

@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmfencedFrame.h"
 

layout/mathml/nsMathMLmfracFrame.cpp

@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmfracFrame.h"
 #include "nsDisplayList.h"

layout/mathml/nsMathMLmmultiscriptsFrame.cpp

@@ -45,7 +45,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmmultiscriptsFrame.h"
 

layout/mathml/nsMathMLmoFrame.cpp

@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 #include "nsContentUtils.h"
 
 #include "nsIDOMText.h"

layout/mathml/nsMathMLmoverFrame.cpp

@@ -47,7 +47,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmoverFrame.h"
 #include "nsMathMLmsupFrame.h"

layout/mathml/nsMathMLmpaddedFrame.cpp

@@ -45,7 +45,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmpaddedFrame.h"
 

layout/mathml/nsMathMLmphantomFrame.cpp

@@ -42,7 +42,6 @@
 #include "nsFrame.h"
 #include "nsPresContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmphantomFrame.h"
 

layout/mathml/nsMathMLmrootFrame.cpp

@@ -46,7 +46,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmrootFrame.h"
 

layout/mathml/nsMathMLmrowFrame.cpp

@@ -42,7 +42,6 @@
 #include "nsFrame.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmrowFrame.h"
 

layout/mathml/nsMathMLmspaceFrame.cpp

@@ -42,7 +42,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmspaceFrame.h"
 

layout/mathml/nsMathMLmstyleFrame.cpp

@@ -43,7 +43,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmstyleFrame.h"
 

layout/mathml/nsMathMLmsubFrame.cpp

@@ -44,7 +44,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmsubFrame.h"
 

layout/mathml/nsMathMLmsubsupFrame.cpp

@@ -45,7 +45,6 @@
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmsubsupFrame.h"
 

layout/mathml/nsMathMLmsupFrame.cpp

@@ -43,7 +43,6 @@
 #include "nsPresContext.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmsupFrame.h"
 

layout/mathml/nsMathMLmtableFrame.cpp

@@ -44,7 +44,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsTArray.h"
 #include "nsCSSFrameConstructor.h"

layout/mathml/nsMathMLmunderFrame.cpp

@@ -47,7 +47,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmunderFrame.h"
 #include "nsMathMLmsubFrame.h"

layout/mathml/nsMathMLmunderoverFrame.cpp

@@ -47,7 +47,6 @@
 #include "nsStyleConsts.h"
 #include "nsINameSpaceManager.h"
 #include "nsRenderingContext.h"
-#include "nsIFontMetrics.h"
 
 #include "nsMathMLmunderoverFrame.h"
 #include "nsMathMLmsubsupFrame.h"

layout/style/StyleRule.cpp

@@ -57,7 +57,6 @@
 #include "nsString.h"
 #include "nsStyleConsts.h"
 #include "nsStyleUtil.h"
-#include "nsIFontMetrics.h"
 #include "nsIDOMCSSStyleSheet.h"
 #include "nsICSSStyleRuleDOMWrapper.h"
 #include "nsIDOMCSSStyleDeclaration.h"

layout/svg/base/src/nsSVGUtils.cpp

@@ -78,7 +78,6 @@
 #include "gfxImageSurface.h"
 #include "gfxPlatform.h"
 #include "nsSVGForeignObjectFrame.h"
-#include "nsIFontMetrics.h"
 #include "nsIDOMSVGUnitTypes.h"
 #include "nsSVGEffects.h"
 #include "nsMathUtils.h"

layout/xul/base/src/nsImageBoxFrame.cpp

@@ -44,7 +44,6 @@
 
 #include "nsImageBoxFrame.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsStyleContext.h"
 #include "nsStyleConsts.h"
@@ -65,7 +64,6 @@
 #include "nsILoadGroup.h"
 #include "nsHTMLContainerFrame.h"
 #include "prprf.h"
-#include "nsIFontMetrics.h"
 #include "nsCSSRendering.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsIDeviceContext.h"

layout/xul/base/src/nsLeafBoxFrame.cpp

@@ -46,7 +46,6 @@
 #include "nsBoxFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsStyleContext.h"

layout/xul/base/src/nsTextBoxFrame.cpp

@@ -49,7 +49,6 @@
 #include "nsTextBoxFrame.h"
 #include "nsCOMPtr.h"
 #include "nsIDeviceContext.h"
-#include "nsIFontMetrics.h"
 #include "nsGkAtoms.h"
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
@@ -72,7 +71,6 @@
 #include "nsCSSRendering.h"
 #include "nsIReflowCallback.h"
 #include "nsBoxFrame.h"
-#include "nsIThebesFontMetrics.h"
 
 #ifdef IBMBIDI
 #include "nsBidiUtils.h"

layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp

@@ -76,7 +76,6 @@
 #include "nsIContent.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsCSSRendering.h"
-#include "nsIFontMetrics.h"
 #include "nsIDeviceContext.h"
 #include "nsIXULTemplateBuilder.h"
 #include "nsXPIDLString.h"