summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 23:12:19 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-07 23:12:19 +0000
commit9903c6cd6567c8a9e0227232a83387db6383ef9d (patch)
treefc48b1fafa88a56dfb95089a1ba577931762b2bd /chrome/common
parent3701009cea1762df31f8108ca182ded30333a303 (diff)
downloadchromium_src-9903c6cd6567c8a9e0227232a83387db6383ef9d.zip
chromium_src-9903c6cd6567c8a9e0227232a83387db6383ef9d.tar.gz
chromium_src-9903c6cd6567c8a9e0227232a83387db6383ef9d.tar.bz2
Linux build fix.
(Was building test_shell, not chrome and forgot about chrome_font.cc) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/gfx/chrome_font_skia.cc2
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) {