From 6fee786210bd2f9ef8d5d570530b05ef6cb02fa1 Mon Sep 17 00:00:00 2001 From: bungeman Date: Wed, 12 Nov 2014 08:29:15 -0800 Subject: [PATCH] Remove SK_USE_SCALED_FONTMETRICS. This define was added in "SK_USE_SCALED_FONTMETRICS for correct scaling" c17c6582ec0b7bc211d7de9e8d634692d239c123. Users all now define this flag, so it may now be removed. BUG=chromium:420901 Review URL: https://codereview.chromium.org/720743003 --- src/ports/SkFontHost_FreeType.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index c7c77ff016..f166e0b191 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -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;