diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-08 11:31:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-08 11:31:39 -0700 |
| commit | f09e46e938cd041315f25de3d23560c12c08bf4e (patch) | |
| tree | e48aad8f431aed637583f577a7af9c66f2fdb207 /core/jni | |
| parent | 7f4ae758ba4724f7c3031d33ad8e749c11d1e059 (diff) | |
| download | frameworks_base-f09e46e938cd041315f25de3d23560c12c08bf4e.zip frameworks_base-f09e46e938cd041315f25de3d23560c12c08bf4e.tar.gz frameworks_base-f09e46e938cd041315f25de3d23560c12c08bf4e.tar.bz2 | |
Revert "Adapt TextLayoutCache for new Harfbuzz scripts"
This reverts commit 7f4ae758ba4724f7c3031d33ad8e749c11d1e059
This CL created a regression:
#5134317 Arabic Keyboard does not appear
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 170957c..6e73889 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -178,7 +178,6 @@ LOCAL_C_INCLUDES += \ external/icu4c/i18n \ external/icu4c/common \ external/jpeg \ - external/harfbuzz/contrib \ external/harfbuzz/src \ external/zlib \ frameworks/opt/emoji \ diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index a29eb38..30fe298 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -17,10 +17,6 @@ #include "TextLayoutCache.h" #include "TextLayout.h" -extern "C" { -#include "harfbuzz-unicode.h" -} - namespace android { TextLayoutCache::TextLayoutCache() : @@ -359,9 +355,7 @@ void TextLayoutCacheValue::setupShaperItem(HB_ShaperItem* shaperItem, HB_FontRec shaperItem->item.pos = start; shaperItem->item.length = count; shaperItem->item.bidiLevel = isRTL; - - ssize_t iter = 0; - shaperItem->item.script = code_point_to_script(utf16_to_code_point(chars, count, &iter)); + shaperItem->item.script = isRTL ? HB_Script_Arabic : HB_Script_Common; shaperItem->string = chars; shaperItem->stringLength = contextCount; |