summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangxianzhu <wangxianzhu@chromium.org>2015-01-08 17:51:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-09 01:54:16 +0000
commit03c38d9dc88a9b1b040218fbdd56ed4e2eb82653 (patch)
treeb893e6c7e982e4309dd0141b9e0ce07162a0f52c
parent1d5b83105901dbc9b79e52cfff944d32d829e9e3 (diff)
downloadchromium_src-03c38d9dc88a9b1b040218fbdd56ed4e2eb82653.zip
chromium_src-03c38d9dc88a9b1b040218fbdd56ed4e2eb82653.tar.gz
chromium_src-03c38d9dc88a9b1b040218fbdd56ed4e2eb82653.tar.bz2
Define SK_USE_FREETYPE_EMBOLDEN on Android
(From https://codereview.chromium.org/411313002/ by h.joshi@samsung.com: Colored Emoji not drawn in Chrome if font style is set as Bold. When Bold font is asked, then Skia try to generate image/bitmap from path (if Bold font is not present) which is not correct case for Colored Emoji bitmap font.) Define SK_USE_FREETYPE_EMBOLDEN to prefer FreeType's emboldeing algorithm to Skia's. BUG=397069 R=h.joshi TBR=bungeman Review URL: https://codereview.chromium.org/800133008 Cr-Commit-Position: refs/heads/master@{#310662}
-rw-r--r--skia/config/SkUserConfig.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index cb19ff5..822961c 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -207,14 +207,14 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
#define SK_CPU_LENDIAN
#undef SK_CPU_BENDIAN
-#elif defined(SK_BUILD_FOR_UNIX)
+#elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
// Prefer FreeType's emboldening algorithm to Skia's
// TODO: skia used to just use hairline, but has improved since then, so
// we should revisit this choice...
#define SK_USE_FREETYPE_EMBOLDEN
-#ifdef SK_CPU_BENDIAN
+#if defined(SK_BUILD_FOR_UNIX) && defined(SK_CPU_BENDIAN)
// Above we set the order for ARGB channels in registers. I suspect that, on
// big endian machines, you can keep this the same and everything will work.
// The in-memory order will be different, of course, but as long as everything