diff options
| author | Toby Sargeant <tobiasjs@google.com> | 2015-02-18 15:03:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-18 15:03:41 +0000 |
| commit | c08e75972a4e0d5e66f91b909b93612c69880e6d (patch) | |
| tree | c857e149d93fc990df7b454fd5ae58bd1e30f032 | |
| parent | ae41c9efad730c18fd5d265d5ca66315e85a4520 (diff) | |
| parent | 8d271d8f60de8e83f653baf9753aa562fbccd956 (diff) | |
| download | chromium_org-c08e75972a4e0d5e66f91b909b93612c69880e6d.tar.gz | |
Merge "Cherry-pick: Define SK_USE_FREETYPE_EMBOLDEN on Android" into m40
| -rw-r--r-- | skia/config/SkUserConfig.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index 887d37ae9a..1485f22a65 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -197,14 +197,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 |