diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/gfx/chrome_font_skia.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/common/gfx/chrome_font_skia.cc b/chrome/common/gfx/chrome_font_skia.cc index 0c3b721..ae62a7a 100644 --- a/chrome/common/gfx/chrome_font_skia.cc +++ b/chrome/common/gfx/chrome_font_skia.cc @@ -37,13 +37,9 @@ void ChromeFont::calculateMetrics() { PaintSetup(&paint); paint.getFontMetrics(&metrics); - if (metrics.fVDMXMetricsValid) { - ascent_ = metrics.fVDMXAscent; - height_ = ascent_ + metrics.fVDMXDescent; - } else { - ascent_ = SkScalarRound(-metrics.fAscent); - height_ = SkScalarRound(metrics.fAscent + metrics.fDescent + metrics.fLeading); - } + ascent_ = SkScalarRound(-metrics.fAscent); + height_ = SkScalarRound(-metrics.fAscent + metrics.fDescent + + metrics.fLeading); if (metrics.fAvgCharWidth) { avg_width_ = SkScalarRound(metrics.fAvgCharWidth); |