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

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index ef943aa5a046f3aaa811c4f3b7a9da5040f7eb5e..2f812bc825a7d37ae389822e493119386c0cd0d6 100644 (file)
--- 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: