diff options
| author |  bungeman <bungeman@google.com> | 2014-11-12 08:29:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-12 08:29:16 -0800 |
| commit | 6fee786210bd2f9ef8d5d570530b05ef6cb02fa1 (patch) | |
| tree | 4448c9c1d559c38c93efa004bbc2e88245f19f6b | |
| parent | ef09991255446c9e20ae66f9c6bb938c60cd68f9 (diff) | |
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
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 6 |
1 files changed, 0 insertions, 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; |