From 7d7e576868fe78bf1b95968ad5d6ddc395c65ec9 Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Tue, 23 Mar 2010 11:07:30 +0900
Subject: Use EmojiFoctory::GetShiftJisConverterName() instead of relying on
 static string.

This change should be with the change Iccbef288.

Bug: 2327318
Change-Id: Ie67d6c1ef60d8e57784e903e3e00a73d3bec0f82
---
 WebKit/android/icu/unicode/ucnv.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'WebKit/android/icu')

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);
 }
-- 
cgit v1.1