diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-03-23 11:07:30 +0900 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-03-23 11:07:30 +0900 |
| commit | 7d7e576868fe78bf1b95968ad5d6ddc395c65ec9 (patch) | |
| tree | c15ecf274716ebc9003290c9aa182e86b16d4200 | |
| parent | 0471b981593b698f38afb8654f7076898ef56387 (diff) | |
| download | external_webkit-7d7e576868fe78bf1b95968ad5d6ddc395c65ec9.zip external_webkit-7d7e576868fe78bf1b95968ad5d6ddc395c65ec9.tar.gz external_webkit-7d7e576868fe78bf1b95968ad5d6ddc395c65ec9.tar.bz2 | |
Use EmojiFoctory::GetShiftJisConverterName() instead of relying on static string.
This change should be with the change Iccbef288.
Bug: 2327318
Change-Id: Ie67d6c1ef60d8e57784e903e3e00a73d3bec0f82
| -rw-r--r-- | WebKit/android/icu/unicode/ucnv.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/icu/unicode/ucnv.cpp b/WebKit/android/icu/unicode/ucnv.cpp index 1963dd2..1b40573 100644 --- a/WebKit/android/icu/unicode/ucnv.cpp +++ b/WebKit/android/icu/unicode/ucnv.cpp @@ -40,8 +40,9 @@ namespace android { U_STABLE UConverter* U_EXPORT2 ucnv_open_emoji(const char *converterName, UErrorCode *err) { if (EmojiFont::IsAvailable()) { - if (strcmp(converterName, "Shift_JIS") == 0) - converterName = "docomo-emoji"; + if (strcmp(converterName, "Shift_JIS") == 0) { + converterName = EmojiFont::GetShiftJisConverterName(); + } } return ucnv_open(converterName, err); } |