From 9f143f420f6ac452538e3b9b51f238fd9f83015c Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 7 Apr 2011 18:04:41 -0700 Subject: [PATCH] Bug 174055, part 1: minimize inclusion of nsI(Thebes)FontMetrics.h. --- accessible/src/html/nsHyperTextAccessible.cpp | 1 - gfx/src/nsThebesDeviceContext.cpp | 1 - layout/base/nsBidiPresUtils.cpp | 1 - layout/base/nsCaret.cpp | 1 - layout/base/nsLayoutUtils.cpp | 1 - layout/forms/nsGfxButtonControlFrame.cpp | 1 - layout/forms/nsImageControlFrame.cpp | 1 - layout/forms/nsTextControlFrame.cpp | 1 - layout/generic/nsBRFrame.cpp | 1 - layout/generic/nsBlockFrame.cpp | 1 - layout/generic/nsBlockReflowContext.cpp | 1 - layout/generic/nsBulletFrame.cpp | 1 - layout/generic/nsHTMLContainerFrame.cpp | 2 -- layout/generic/nsImageFrame.cpp | 1 - layout/generic/nsInlineFrame.cpp | 1 - layout/generic/nsLineLayout.cpp | 2 -- layout/generic/nsPageFrame.cpp | 1 - layout/generic/nsSimplePageSequence.cpp | 1 - layout/generic/nsTextFrameThebes.cpp | 2 -- layout/mathml/nsMathMLChar.cpp | 1 - layout/mathml/nsMathMLContainerFrame.cpp | 1 - layout/mathml/nsMathMLForeignFrameWrapper.cpp | 1 - layout/mathml/nsMathMLTokenFrame.cpp | 1 - layout/mathml/nsMathMLmactionFrame.cpp | 1 - layout/mathml/nsMathMLmencloseFrame.cpp | 1 - layout/mathml/nsMathMLmfencedFrame.cpp | 1 - layout/mathml/nsMathMLmfracFrame.cpp | 1 - layout/mathml/nsMathMLmmultiscriptsFrame.cpp | 1 - layout/mathml/nsMathMLmoFrame.cpp | 1 - layout/mathml/nsMathMLmoverFrame.cpp | 1 - layout/mathml/nsMathMLmpaddedFrame.cpp | 1 - layout/mathml/nsMathMLmphantomFrame.cpp | 1 - layout/mathml/nsMathMLmrootFrame.cpp | 1 - layout/mathml/nsMathMLmrowFrame.cpp | 1 - layout/mathml/nsMathMLmspaceFrame.cpp | 1 - layout/mathml/nsMathMLmstyleFrame.cpp | 1 - layout/mathml/nsMathMLmsubFrame.cpp | 1 - layout/mathml/nsMathMLmsubsupFrame.cpp | 1 - layout/mathml/nsMathMLmsupFrame.cpp | 1 - layout/mathml/nsMathMLmtableFrame.cpp | 1 - layout/mathml/nsMathMLmunderFrame.cpp | 1 - layout/mathml/nsMathMLmunderoverFrame.cpp | 1 - layout/style/StyleRule.cpp | 1 - layout/svg/base/src/nsSVGUtils.cpp | 1 - layout/xul/base/src/nsImageBoxFrame.cpp | 2 -- layout/xul/base/src/nsLeafBoxFrame.cpp | 1 - layout/xul/base/src/nsTextBoxFrame.cpp | 2 -- layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp | 1 - 48 files changed, 53 deletions(-) diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp index 7a000594282e..601e5b145e18 100644 --- a/accessible/src/html/nsHyperTextAccessible.cpp +++ b/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" diff --git a/gfx/src/nsThebesDeviceContext.cpp b/gfx/src/nsThebesDeviceContext.cpp index 123562caf248..d6571f25ee1f 100644 --- a/gfx/src/nsThebesDeviceContext.cpp +++ b/gfx/src/nsThebesDeviceContext.cpp @@ -39,7 +39,6 @@ #include "nsFont.h" #include "nsGfxCIID.h" -#include "nsIThebesFontMetrics.h" #include "nsILanguageAtomService.h" #include "nsUnicharUtils.h" diff --git a/layout/base/nsBidiPresUtils.cpp b/layout/base/nsBidiPresUtils.cpp index b63cc402009f..8bf0176cf991 100644 --- a/layout/base/nsBidiPresUtils.cpp +++ b/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 diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index c3997b837c07..189a9282a1c2 100644 --- a/layout/base/nsCaret.cpp +++ b/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" diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index ad2a608c5e17..98fc545abdfa 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/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" diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp index 4a15bbfb3447..1296ce4be583 100644 --- a/layout/forms/nsGfxButtonControlFrame.cpp +++ b/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" diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp index 0a95b9484f2d..111e237e3139 100644 --- a/layout/forms/nsImageControlFrame.cpp +++ b/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" diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index 995eb25c8907..50f4eb2e08ef 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/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" diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp index 0fbe88912517..be0465b67745 100644 --- a/layout/generic/nsBRFrame.cpp +++ b/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" diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index ab8dd116d221..48f6df0be056 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/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" diff --git a/layout/generic/nsBlockReflowContext.cpp b/layout/generic/nsBlockReflowContext.cpp index b3d035abda62..c2b0a957c9ce 100644 --- a/layout/generic/nsBlockReflowContext.cpp +++ b/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" diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp index 8bdae1d07b80..35e700401788 100644 --- a/layout/generic/nsBulletFrame.cpp +++ b/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" diff --git a/layout/generic/nsHTMLContainerFrame.cpp b/layout/generic/nsHTMLContainerFrame.cpp index fe7121854036..9a69425dd040 100644 --- a/layout/generic/nsHTMLContainerFrame.cpp +++ b/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" diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 7b46a08f9520..acd2c4c7ca16 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/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" diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index de2ef02646fa..9702107af234 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/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" diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp index dee33d9c8088..dd8623e46573 100644 --- a/layout/generic/nsLineLayout.cpp +++ b/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" diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index 0256bab55da4..a21ca579d72f 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -53,7 +53,6 @@ #ifdef IBMBIDI #include "nsBidiUtils.h" #endif -#include "nsIFontMetrics.h" #include "nsIPrintSettings.h" #include "nsRegion.h" diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp index deb14536a9fa..aa7c3841744a 100644 --- a/layout/generic/nsSimplePageSequence.cpp +++ b/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" diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp index 92e8bcb25aa6..027512ba08c2 100644 --- a/layout/generic/nsTextFrameThebes.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLChar.cpp b/layout/mathml/nsMathMLChar.cpp index 05600f7a9838..0a229e8f1386 100644 --- a/layout/mathml/nsMathMLChar.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp index c579deba8520..aa0b707a020b 100644 --- a/layout/mathml/nsMathMLContainerFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLForeignFrameWrapper.cpp b/layout/mathml/nsMathMLForeignFrameWrapper.cpp index ac314b4184e1..581b5f0fe735 100644 --- a/layout/mathml/nsMathMLForeignFrameWrapper.cpp +++ b/layout/mathml/nsMathMLForeignFrameWrapper.cpp @@ -49,7 +49,6 @@ #include "nsPresContext.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" -#include "nsIFontMetrics.h" #include "nsMathMLForeignFrameWrapper.h" diff --git a/layout/mathml/nsMathMLTokenFrame.cpp b/layout/mathml/nsMathMLTokenFrame.cpp index db5511bc9d5c..e9718beae319 100644 --- a/layout/mathml/nsMathMLTokenFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLmactionFrame.cpp b/layout/mathml/nsMathMLmactionFrame.cpp index da8cf51b2501..e173a6f0f7d0 100644 --- a/layout/mathml/nsMathMLmactionFrame.cpp +++ b/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() diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp index 39be5d717baf..b3f7f68130dc 100644 --- a/layout/mathml/nsMathMLmencloseFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp index d85f09b3d28a..73ddb52782ef 100644 --- a/layout/mathml/nsMathMLmfencedFrame.cpp +++ b/layout/mathml/nsMathMLmfencedFrame.cpp @@ -46,7 +46,6 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsRenderingContext.h" -#include "nsIFontMetrics.h" #include "nsMathMLmfencedFrame.h" diff --git a/layout/mathml/nsMathMLmfracFrame.cpp b/layout/mathml/nsMathMLmfracFrame.cpp index 070430189d9d..023ec02e7400 100644 --- a/layout/mathml/nsMathMLmfracFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp index 2fed0b9a9c37..f2a13afff544 100644 --- a/layout/mathml/nsMathMLmmultiscriptsFrame.cpp +++ b/layout/mathml/nsMathMLmmultiscriptsFrame.cpp @@ -45,7 +45,6 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsRenderingContext.h" -#include "nsIFontMetrics.h" #include "nsMathMLmmultiscriptsFrame.h" diff --git a/layout/mathml/nsMathMLmoFrame.cpp b/layout/mathml/nsMathMLmoFrame.cpp index d9e01b371ac4..f0862faf41e0 100644 --- a/layout/mathml/nsMathMLmoFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLmoverFrame.cpp b/layout/mathml/nsMathMLmoverFrame.cpp index 53c318f48579..a814a7feb2c6 100644 --- a/layout/mathml/nsMathMLmoverFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLmpaddedFrame.cpp b/layout/mathml/nsMathMLmpaddedFrame.cpp index d72b532fbce5..2dfe23f11783 100644 --- a/layout/mathml/nsMathMLmpaddedFrame.cpp +++ b/layout/mathml/nsMathMLmpaddedFrame.cpp @@ -45,7 +45,6 @@ #include "nsPresContext.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" -#include "nsIFontMetrics.h" #include "nsMathMLmpaddedFrame.h" diff --git a/layout/mathml/nsMathMLmphantomFrame.cpp b/layout/mathml/nsMathMLmphantomFrame.cpp index c9dff332dde7..63f5a218836a 100644 --- a/layout/mathml/nsMathMLmphantomFrame.cpp +++ b/layout/mathml/nsMathMLmphantomFrame.cpp @@ -42,7 +42,6 @@ #include "nsFrame.h" #include "nsPresContext.h" #include "nsStyleConsts.h" -#include "nsIFontMetrics.h" #include "nsMathMLmphantomFrame.h" diff --git a/layout/mathml/nsMathMLmrootFrame.cpp b/layout/mathml/nsMathMLmrootFrame.cpp index 96c3a82ca29b..c654d27a4952 100644 --- a/layout/mathml/nsMathMLmrootFrame.cpp +++ b/layout/mathml/nsMathMLmrootFrame.cpp @@ -46,7 +46,6 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsRenderingContext.h" -#include "nsIFontMetrics.h" #include "nsMathMLmrootFrame.h" diff --git a/layout/mathml/nsMathMLmrowFrame.cpp b/layout/mathml/nsMathMLmrowFrame.cpp index c399454c52fc..598fce781578 100644 --- a/layout/mathml/nsMathMLmrowFrame.cpp +++ b/layout/mathml/nsMathMLmrowFrame.cpp @@ -42,7 +42,6 @@ #include "nsFrame.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" -#include "nsIFontMetrics.h" #include "nsMathMLmrowFrame.h" diff --git a/layout/mathml/nsMathMLmspaceFrame.cpp b/layout/mathml/nsMathMLmspaceFrame.cpp index a655a7f15738..98a519a13c37 100644 --- a/layout/mathml/nsMathMLmspaceFrame.cpp +++ b/layout/mathml/nsMathMLmspaceFrame.cpp @@ -42,7 +42,6 @@ #include "nsPresContext.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" -#include "nsIFontMetrics.h" #include "nsMathMLmspaceFrame.h" diff --git a/layout/mathml/nsMathMLmstyleFrame.cpp b/layout/mathml/nsMathMLmstyleFrame.cpp index b3f9dca35e13..bf7340c8d87d 100644 --- a/layout/mathml/nsMathMLmstyleFrame.cpp +++ b/layout/mathml/nsMathMLmstyleFrame.cpp @@ -43,7 +43,6 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsINameSpaceManager.h" -#include "nsIFontMetrics.h" #include "nsMathMLmstyleFrame.h" diff --git a/layout/mathml/nsMathMLmsubFrame.cpp b/layout/mathml/nsMathMLmsubFrame.cpp index 664ac6797b87..bd0ceb097c54 100644 --- a/layout/mathml/nsMathMLmsubFrame.cpp +++ b/layout/mathml/nsMathMLmsubFrame.cpp @@ -44,7 +44,6 @@ #include "nsPresContext.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" -#include "nsIFontMetrics.h" #include "nsMathMLmsubFrame.h" diff --git a/layout/mathml/nsMathMLmsubsupFrame.cpp b/layout/mathml/nsMathMLmsubsupFrame.cpp index 8ea764dfae75..c6b72d935244 100644 --- a/layout/mathml/nsMathMLmsubsupFrame.cpp +++ b/layout/mathml/nsMathMLmsubsupFrame.cpp @@ -45,7 +45,6 @@ #include "nsStyleContext.h" #include "nsStyleConsts.h" #include "nsRenderingContext.h" -#include "nsIFontMetrics.h" #include "nsMathMLmsubsupFrame.h" diff --git a/layout/mathml/nsMathMLmsupFrame.cpp b/layout/mathml/nsMathMLmsupFrame.cpp index fcda402b81b4..89f3c168e648 100644 --- a/layout/mathml/nsMathMLmsupFrame.cpp +++ b/layout/mathml/nsMathMLmsupFrame.cpp @@ -43,7 +43,6 @@ #include "nsPresContext.h" #include "nsStyleContext.h" #include "nsStyleConsts.h" -#include "nsIFontMetrics.h" #include "nsMathMLmsupFrame.h" diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp index 91a1c550b806..18cd3d84ba87 100644 --- a/layout/mathml/nsMathMLmtableFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLmunderFrame.cpp b/layout/mathml/nsMathMLmunderFrame.cpp index 6108e1f3d33f..14fb656a72ba 100644 --- a/layout/mathml/nsMathMLmunderFrame.cpp +++ b/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" diff --git a/layout/mathml/nsMathMLmunderoverFrame.cpp b/layout/mathml/nsMathMLmunderoverFrame.cpp index b6b14929f352..4f1c0489dbcb 100644 --- a/layout/mathml/nsMathMLmunderoverFrame.cpp +++ b/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" diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp index 244afffd7b0d..143f2dc3f73b 100644 --- a/layout/style/StyleRule.cpp +++ b/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" diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp index 6b8d70b0251e..c57692c6d362 100644 --- a/layout/svg/base/src/nsSVGUtils.cpp +++ b/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" diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp index ae87465d8e12..502f87396183 100644 --- a/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/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" diff --git a/layout/xul/base/src/nsLeafBoxFrame.cpp b/layout/xul/base/src/nsLeafBoxFrame.cpp index 933f7b7a74cd..460ace1b86ad 100644 --- a/layout/xul/base/src/nsLeafBoxFrame.cpp +++ b/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" diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp index c7758f7af326..6b3d60893d14 100644 --- a/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/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" diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp index 8813d0d8a0a2..6c75326d3966 100644 --- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp +++ b/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"