diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 23:16:46 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 23:16:46 +0000 |
| commit | c8bdcb753bcbe960bc239419180d085534ef8432 (patch) | |
| tree | ee4fe15caace7a6e8a893b5b52ec421fbcfc5269 /chrome | |
| parent | 9903c6cd6567c8a9e0227232a83387db6383ef9d (diff) | |
| download | chromium_src-c8bdcb753bcbe960bc239419180d085534ef8432.zip chromium_src-c8bdcb753bcbe960bc239419180d085534ef8432.tar.gz chromium_src-c8bdcb753bcbe960bc239419180d085534ef8432.tar.bz2 | |
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
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/gfx/chrome_font_skia.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |