commit 858a78912473a60b77f23618859670f721adcec9
author djsollen <djsollen@google.com> Wed Aug 20 07:03:23 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 20 07:03:23 2014 -0700
tree 4ceabc88e364c26d9e80fb1b0324de9d97761cec
parent 367d03fb5aa529f9bc8a64e538d1a80c4f015f07

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

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index ef943aa..2f812bc 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -953,6 +953,10 @@
             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: