From af316a7d7d18bb167d6413e2278bc66f2183f61c Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Thu, 12 Mar 2015 10:47:50 +0000 Subject: [PATCH] Bug 1136557 - pt 2 - Round maxDescent similarly to maxAscent in nsFontMetrics. r=smontagu --- gfx/src/nsFontMetrics.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp index a7d96280b03f..dfb0a84da087 100644 --- a/gfx/src/nsFontMetrics.cpp +++ b/gfx/src/nsFontMetrics.cpp @@ -216,8 +216,8 @@ static gfxFloat ComputeMaxDescent(const gfxFont::Metrics& aMetrics, { gfxFloat offset = floor(-aFontGroup->GetUnderlineOffset() + 0.5); gfxFloat size = NS_round(aMetrics.underlineSize); - gfxFloat minDescent = floor(offset + size + 0.5); - return std::max(minDescent, aMetrics.maxDescent); + gfxFloat minDescent = offset + size; + return floor(std::max(minDescent, aMetrics.maxDescent) + 0.5); } static gfxFloat ComputeMaxAscent(const gfxFont::Metrics& aMetrics)