diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 00:43:02 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-08 00:43:02 +0000 |
commit | b551829b85f7a473497d9051ffb0edbf4ba1b589 (patch) | |
tree | 397b2566fe799fc5e699bb2a6818dfc2ff0b7e76 /chrome/common | |
parent | 14b27b4a744757f19e09b630a51a411cf53e1982 (diff) | |
download | chromium_src-b551829b85f7a473497d9051ffb0edbf4ba1b589.zip chromium_src-b551829b85f7a473497d9051ffb0edbf4ba1b589.tar.gz chromium_src-b551829b85f7a473497d9051ffb0edbf4ba1b589.tar.bz2 |
Skia: remove fHeight (retry)
Skia was previously calculating the leading value incorrectly, leading
us to add fHeight to get the height of a line of text. Now that Skia
is calculating fLeading correctly, we can remove fHeight.
http://codereview.chromium.org/62123
https://bugs.webkit.org/show_bug.cgi?id=25083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-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 6c80c8d..0c3b721 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.fHeight); + height_ = SkScalarRound(metrics.fAscent + metrics.fDescent + metrics.fLeading); } if (metrics.fAvgCharWidth) { |