diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-06-07 15:02:18 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 15:37:56 +0000 |
| commit | d34b8a80f30a176ecf1c01ae7220b5f8af636eb8 (patch) | |
| tree | 60c0ed44d5d29cdd202d40c97d4f90141430b01b /src/ports | |
| parent | dc89f192c853df57c71c42407c193571c2e1008a (diff) | |
Always FreeType autohint when requested.
BUG=skia:8040
Change-Id: I0432588cdd09b85cd4776dd744a345c5b134d5ce
Reviewed-on: https://skia-review.googlesource.com/132933
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 3e8e9576dd..da276b417b 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -794,19 +794,9 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface, loadFlags = FT_LOAD_TARGET_LIGHT; // This implies FORCE_AUTOHINT break; case SkPaint::kNormal_Hinting: - if (fRec.fFlags & SkScalerContext::kForceAutohinting_Flag) { - loadFlags = FT_LOAD_FORCE_AUTOHINT; -#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - } else { - loadFlags = FT_LOAD_NO_AUTOHINT; -#endif - } + loadFlags = FT_LOAD_TARGET_NORMAL; break; case SkPaint::kFull_Hinting: - if (fRec.fFlags & SkScalerContext::kForceAutohinting_Flag) { - loadFlags = FT_LOAD_FORCE_AUTOHINT; - break; - } loadFlags = FT_LOAD_TARGET_NORMAL; if (isLCD(fRec)) { if (fLCDIsVert) { @@ -822,6 +812,14 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface, } } + if (fRec.fFlags & SkScalerContext::kForceAutohinting_Flag) { + loadFlags |= FT_LOAD_FORCE_AUTOHINT; +#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK + } else { + loadFlags |= FT_LOAD_NO_AUTOHINT; +#endif + } + if ((fRec.fFlags & SkScalerContext::kEmbeddedBitmapText_Flag) == 0) { loadFlags |= FT_LOAD_NO_BITMAP; } |