From cc41d8f06b87e10e1dda6cfa1cacb41a9c1df669 Mon Sep 17 00:00:00 2001
From: "masayuki%d-toybox.com" <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

---
 gfx/thebes/src/gfxAtsuiFonts.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gfx/thebes/src/gfxAtsuiFonts.cpp b/gfx/thebes/src/gfxAtsuiFonts.cpp
index 4f36e2b21adc..b45afc47367b 100644
--- a/gfx/thebes/src/gfxAtsuiFonts.cpp
+++ b/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;