From 936f60a0909e25735f1f83a6d0f87ca9200b0ba7 Mon Sep 17 00:00:00 2001 From: "masayuki%d-toybox.com" Date: Mon, 9 Oct 2006 09:02:26 +0000 Subject: [PATCH] b=353185 backing out the previous patch that breaks the Linux git-svn-id: svn://10.0.0.236/trunk@213340 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp b/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp index 4f36e2b21ad..b45afc47367 100644 --- a/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp +++ b/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp @@ -123,14 +123,10 @@ gfxAtsuiFont::gfxAtsuiFont(ATSUFontID fontID, mMetrics.maxAscent = atsMetrics.ascent * size; mMetrics.maxDescent = - (atsMetrics.descent * size); - mMetrics.maxHeight = mMetrics.maxAscent + mMetrics.maxDescent; - mMetrics.internalLeading = atsMetrics.leading * size; mMetrics.externalLeading = 0.0; - if (mMetrics.maxHeight - mMetrics.emHeight > mMetrics.internalLeading) - mMetrics.emHeight = mMetrics.maxHeight - mMetrics.internalLeading; - + mMetrics.maxHeight = mMetrics.maxAscent + mMetrics.maxDescent; mMetrics.emAscent = mMetrics.maxAscent * mMetrics.emHeight / mMetrics.maxHeight; mMetrics.emDescent = mMetrics.emHeight - mMetrics.emAscent;