AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SK_USE_SCALED_FONTMETRICS.

Browse Source 
This define was added in
"SK_USE_SCALED_FONTMETRICS for correct scaling"
c17c6582ec.
Users all now define this flag, so it may now be removed.

BUG=chromium:420901

Review URL: https://codereview.chromium.org/720743003
This commit is contained in:
bungeman 2014-11-12 08:29:15 -08:00 committed by Commit bot
parent ef09991255
commit 6fee786210
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ports/SkFontHost_FreeType.cpp
View File

@ -1495,14 +1495,8 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics
metrics->fBottom = ymin * scale;
metrics->fLeading = leading * scale;
metrics->fAvgCharWidth = avgCharWidth * scale;
#ifdef SK_USE_SCALED_FONTMETRICS
// new correct behavior. need chrome to define this, and then we can remove the else code
metrics->fXMin = xmin * scale;
metrics->fXMax = xmax * scale;
#else
metrics->fXMin = xmin;
metrics->fXMax = xmax;
#endif
metrics->fXHeight = x_height;
metrics->fCapHeight = cap_height;
metrics->fUnderlineThickness = underlineThickness * scale;