drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev

Browse Source
This commit is contained in:
Raph Levien
2013-04-23 21:19:19 +00:00
committed by Android (Google) Code Review
parent 89a6081447 9d47db23ff
commit 22a3344cda
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/jni/android/graphics/TextLayoutCache.cpp
View File

@ -622,11 +622,11 @@ hb_utf16_script_run_prev(ScriptRun* run, const uint16_t *chars, size_t len, ssiz
const hb_script_t init_script = code_point_to_script(init_cp);
hb_script_t current_script = init_script;
run->script = init_script;
size_t break_iter = *iter;
for (;;) {
if (*iter < 0)
break;
const ssize_t prev_iter = *iter;
const uint32_t cp = utf16_to_code_point_prev(chars, len, iter);
const hb_script_t script = code_point_to_script(cp);
@ -635,21 +635,18 @@ hb_utf16_script_run_prev(ScriptRun* run, const uint16_t *chars, size_t len, ssiz
// If we started off as inherited, we take whatever we can find.
run->script = script;
current_script = script;
// In cases of script1 + inherited + script2, always group the inherited
// with script1.
break_iter = *iter;
continue;
} else if (script == HB_SCRIPT_INHERITED) {
/* BEGIN android-changed
We apply the same fix for Chrome to Android.
Chrome team will talk with upsteam about it.
Just assume that whatever follows this combining character is within
the same script. This is incorrect if you had language1 + combining
char + language 2, but that is rare and this code is suspicious
anyway.
END android-changed */
continue;
} else {
*iter = prev_iter;
*iter = break_iter;
break;
}
} else {
break_iter = *iter;
}
}