aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2014-08-20 07:03:23 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-08-20 07:03:23 -0700
commit858a78912473a60b77f23618859670f721adcec9 (patch)
tree4ceabc88e364c26d9e80fb1b0324de9d97761cec /src
parent367d03fb5aa529f9bc8a64e538d1a80c4f015f07 (diff)
Revert to old autohinting behavior on Android.
This CL reverts to the NO_AUTOHINT behavior when autohinting is not explicitly requested. This should be removed when Skia supports a better API for selecting the correct variation. This CL has landed in the Android repo and is being upstreamed to avoid fragmenting the codebase. R=bungeman@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/490913003
Diffstat (limited to 'src')
-rw-r--r--src/ports/SkFontHost_FreeType.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index ef943aa5a0..2f812bc825 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -953,6 +953,10 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
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
}
break;
case SkPaint::kFull_Hinting: