From c8bdcb753bcbe960bc239419180d085534ef8432 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Tue, 7 Apr 2009 23:16:46 +0000 Subject: Revert "Skia: remove fHeight" This reverts r13300 and r13299. Something clearly went wrong with the layout tests that I didn't notice. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13301 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/gfx/chrome_font_skia.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome') diff --git a/chrome/common/gfx/chrome_font_skia.cc b/chrome/common/gfx/chrome_font_skia.cc index 0c3b721..6c80c8d 100644 --- a/chrome/common/gfx/chrome_font_skia.cc +++ b/chrome/common/gfx/chrome_font_skia.cc @@ -42,7 +42,7 @@ void ChromeFont::calculateMetrics() { height_ = ascent_ + metrics.fVDMXDescent; } else { ascent_ = SkScalarRound(-metrics.fAscent); - height_ = SkScalarRound(metrics.fAscent + metrics.fDescent + metrics.fLeading); + height_ = SkScalarRound(metrics.fHeight); } if (metrics.fAvgCharWidth) { -- cgit v1.1