commit 1f1543f012b8834ea760175a023eb127bde2b895
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 12 21:08:33 2012 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 12 21:08:33 2012 +0000
tree c1f9df37dc72ff0e853d65041f705801aae8a855
parent 752acc765f8f8709c50bf82bf66b767279f0ca11

re-apply 5508, but with the new compile-flag disabled for now



git-svn-id: http://skia.googlecode.com/svn/trunk@5516 2bbb7eff-a529-9590-31e7-b0007b416f81

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index f25223f..ba0afd8 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -752,8 +752,20 @@
         fMatrix22.xy = fMatrix22.yx = 0;
     }
 
+#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
+    SkScalar hintingScaleFactor = fRec.fHintingScaleFactor;
+
+    fScaleX = SkScalarToFixed(sx / hintingScaleFactor);
+    fScaleY = SkScalarToFixed(sy / hintingScaleFactor);
+
+    fMatrix22.xx *= hintingScaleFactor;
+    fMatrix22.xy *= hintingScaleFactor;
+    fMatrix22.yx *= hintingScaleFactor;
+    fMatrix22.yy *= hintingScaleFactor;
+#else
     fScaleX = SkScalarToFixed(sx);
     fScaleY = SkScalarToFixed(sy);
+#endif
 
     fLCDIsVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag);