diff options
| author | 2017-10-23 18:37:49 +0000 | |
|---|---|---|
| committer | 2017-10-23 18:37:49 +0000 | |
| commit | bb96e19b539be150b5cd4942488f9c5a150f109b (patch) | |
| tree | 45a4a246b1093b9e11282ede9c1c50aeb519b555 | |
| parent | 810a6c53b387491c40ec50ac229c07987673be17 (diff) | |
| parent | 92374482d2af5d3e1fa72d83605511153886f964 (diff) | |
Merge "Rename registerLanguageList to registerLocaleList."
| -rw-r--r-- | core/jni/android/graphics/FontFamily.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android/graphics/Paint.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/jni/android/graphics/FontFamily.cpp b/core/jni/android/graphics/FontFamily.cpp index c6801bf613fa..9e6985ca300e 100644 --- a/core/jni/android/graphics/FontFamily.cpp +++ b/core/jni/android/graphics/FontFamily.cpp @@ -56,9 +56,9 @@ static jlong FontFamily_initBuilder(JNIEnv* env, jobject clazz, jstring langs, j if (langs != nullptr) { ScopedUtfChars str(env, langs); builder = new NativeFamilyBuilder( - minikin::FontStyle::registerLanguageList(str.c_str()), variant); + minikin::FontStyle::registerLocaleList(str.c_str()), variant); } else { - builder = new NativeFamilyBuilder(minikin::FontStyle::registerLanguageList(""), variant); + builder = new NativeFamilyBuilder(minikin::FontStyle::registerLocaleList(""), variant); } return reinterpret_cast<jlong>(builder); } diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index 93bd16b2d08a..fd62a19f310f 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -544,7 +544,7 @@ namespace PaintGlue { static jint setTextLocales(JNIEnv* env, jobject clazz, jlong objHandle, jstring locales) { Paint* obj = reinterpret_cast<Paint*>(objHandle); ScopedUtfChars localesChars(env, locales); - jint minikinLangListId = minikin::FontStyle::registerLanguageList(localesChars.c_str()); + jint minikinLangListId = minikin::FontStyle::registerLocaleList(localesChars.c_str()); obj->setMinikinLangListId(minikinLangListId); return minikinLangListId; } |