diff options
author | Victoria Lease <violets@google.com> | 2013-10-21 15:55:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-21 15:55:30 +0000 |
commit | a80d6424987602cc3141d4cb4cdee21a54747691 (patch) | |
tree | 781a6ad73bebd704a0fde851464d11dd9d6b48aa | |
parent | bf3acff10a62adeb0e2cefc4652c62132445c196 (diff) | |
parent | 677726b376402937f53ddb192dc97078b92b7c9e (diff) | |
download | frameworks_base-a80d6424987602cc3141d4cb4cdee21a54747691.zip frameworks_base-a80d6424987602cc3141d4cb4cdee21a54747691.tar.gz frameworks_base-a80d6424987602cc3141d4cb4cdee21a54747691.tar.bz2 |
Merge "Implement language-specific GSUB processing" into klp-dev
-rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index a0c50fa..92d253f 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -721,7 +721,8 @@ void TextLayoutShaper::computeRunValues(const SkPaint* paint, const UChar* conte hb_buffer_set_direction(mBuffer, isRTL ? HB_DIRECTION_RTL : HB_DIRECTION_LTR); hb_buffer_set_script(mBuffer, run.script); - // Should set language here (for bug 7004056) + SkString langString = paint->getPaintOptionsAndroid().getLanguage().getTag(); + hb_buffer_set_language(mBuffer, hb_language_from_string(langString.c_str(), -1)); hb_buffer_add_utf16(mBuffer, contextChars, contextCount, start + run.pos, run.length); // Initialize Harfbuzz Shaper and get the base glyph count for offsetting the glyphIDs |