Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9576182 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Revert "Adapt TextLayoutCache for new Harfbuzz scripts""

parents 535f6dba f09e46e9

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -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 \

core/jni/android/graphics/TextLayoutCache.cpp

+1 −7
Original line number Diff line number Diff line
@@ -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;