commit 2cc242762de47ca4ca7706ead3bb0d114a5aa523
author The Android Automerger <android-build@android.com> Tue Jul 31 14:07:14 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Jul 31 14:07:14 2012 -0700
tree 21018810259fbfb64d75dc064282f6ce1a4932dd
parent 1d6fa961d4a4787bf9444e2c0e42591236cfcab2
parent d181ce317146c4f930267a36ed2a21c349bd3310

merge in jb-mr0-release history after reset to jb-dev

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 621c94a..fc60ef9 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -63,6 +63,16 @@
     #define SK_GAMMA_EXPONENT   2.2
 #endif
 
+// hand-tuned value to reduce outline embolden strength
+#ifndef SK_OUTLINE_EMBOLDEN_DIVISOR
+    #ifdef SK_BUILD_FOR_ANDROID
+        #define SK_OUTLINE_EMBOLDEN_DIVISOR   34
+    #else
+        #define SK_OUTLINE_EMBOLDEN_DIVISOR   24
+    #endif
+#endif
+
+
 #ifdef SK_DEBUG
     #define SkASSERT_CONTINUE(pred)                                                         \
         do {                                                                                \
@@ -892,7 +902,7 @@
 void SkScalerContext_FreeType::emboldenOutline(FT_Outline* outline) {
     FT_Pos strength;
     strength = FT_MulFix(fFace->units_per_EM, fFace->size->metrics.y_scale)
-               / 24;
+               / SK_OUTLINE_EMBOLDEN_DIVISOR;
     FT_Outline_Embolden(outline, strength);
 }