Roll src/third_party/icu 8ac906f:d8b2a9d (svn 292317:292476)

chrome/browser/character_encoding.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/character_encoding.h"
 
 #include <map>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 typedef struct {
   int resource_id;
   const char* name;
   int category_string_id;
 } CanonicalEncodingData;
 
 // An array of all supported canonical encoding names.
 const CanonicalEncodingData kCanonicalEncodingNames[] = {
   { IDC_ENCODING_UTF8, "UTF-8", IDS_ENCODING_UNICODE },
   { IDC_ENCODING_UTF16LE, "UTF-16LE", IDS_ENCODING_UNICODE },
-  { IDC_ENCODING_ISO88591, "ISO-8859-1", IDS_ENCODING_WESTERN },
   { IDC_ENCODING_WINDOWS1252, "windows-1252", IDS_ENCODING_WESTERN },
   { IDC_ENCODING_GBK, "GBK", IDS_ENCODING_SIMP_CHINESE },
   { IDC_ENCODING_GB18030, "gb18030", IDS_ENCODING_SIMP_CHINESE },
   { IDC_ENCODING_BIG5, "Big5", IDS_ENCODING_TRAD_CHINESE },
   { IDC_ENCODING_BIG5HKSCS, "Big5-HKSCS", IDS_ENCODING_TRAD_CHINESE },
   { IDC_ENCODING_KOREAN, "EUC-KR", IDS_ENCODING_KOREAN },
   { IDC_ENCODING_SHIFTJIS, "Shift_JIS", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_EUCJP, "EUC-JP", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_ISO2022JP, "ISO-2022-JP", IDS_ENCODING_JAPANESE },
   { IDC_ENCODING_THAI, "windows-874", IDS_ENCODING_THAI },
@@ skipping 134 matching lines @@
 // A static map object which contains all resourceid-nonsequenced canonical
 // encoding names.
 CanonicalEncodingMap* CanonicalEncodingMapSingleton() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   static CanonicalEncodingMap* singleton = new CanonicalEncodingMap;
   return singleton;
 }
 
 const int kDefaultEncodingMenus[] = {
   IDC_ENCODING_UTF16LE,
-  IDC_ENCODING_ISO88591,
   IDC_ENCODING_WINDOWS1252,
   IDC_ENCODING_GBK,
   IDC_ENCODING_GB18030,
   IDC_ENCODING_BIG5,
   IDC_ENCODING_BIG5HKSCS,
   IDC_ENCODING_KOREAN,
   IDC_ENCODING_SHIFTJIS,
   IDC_ENCODING_EUCJP,
   IDC_ENCODING_ISO2022JP,
   IDC_ENCODING_THAI,
@@ skipping 43 matching lines @@
     if (available_list->size() == maximum_size)
       return;
   }
 }
 
 base::string16 GetEncodingDisplayName(const std::string& encoding_name,
                                       int category_string_id) {
   base::string16 category_name = l10n_util::GetStringUTF16(category_string_id);
   if (category_string_id != IDS_ENCODING_KOREAN &&
       category_string_id != IDS_ENCODING_THAI &&
-      category_string_id != IDS_ENCODING_TURKISH) {
+      category_string_id != IDS_ENCODING_TURKISH &&
+      category_string_id != IDS_ENCODING_VIETNAMESE &&
+      category_string_id != IDS_ENCODING_ROMANIAN) {
     const CanonicalNameDisplayNameMapType* map =
         CanonicalEncodingMapSingleton()->GetCanonicalNameDisplayNameMapData();
     DCHECK(map);
 
     CanonicalNameDisplayNameMapType::const_iterator found_name =
         map->find(encoding_name);
     DCHECK(found_name != map->end());
     return l10n_util::GetStringFUTF16(IDS_ENCODING_DISPLAY_TEMPLATE,
                                       category_name,
                                       base::ASCIIToUTF16(found_name->second));
@@ skipping 103 matching lines @@
   // If the input alias_name is already canonical encoding name, just return it.
   const CanonicalEncodingNameToIdMapType* map =
       CanonicalEncodingMapSingleton()->GetCanonicalEncodingNameToIdMapData();
   DCHECK(map);
 
   CanonicalEncodingNameToIdMapType::const_iterator found_id =
       map->find(alias_name);
   if (found_id != map->end())
     return alias_name;
 
-  UErrorCode error_code = U_ZERO_ERROR;
-
-  const char* canonical_name = ucnv_getCanonicalName(
-      alias_name.c_str(), "MIME", &error_code);
-  // If failed,  then try IANA next.
-  if (U_FAILURE(error_code) || !canonical_name) {
-    error_code = U_ZERO_ERROR;
-    canonical_name = ucnv_getCanonicalName(
-      alias_name.c_str(), "IANA", &error_code);
+  const char* standards[3] = { "HTML", "MIME", "IANA" };
+  for (size_t i = 0; i < arraysize(standards); ++i) {
+    UErrorCode error_code = U_ZERO_ERROR;
+    const char* canonical_name = ucnv_getCanonicalName(
+        alias_name.c_str(), standards[i], &error_code);
+    if (U_SUCCESS(error_code) && canonical_name)
+      return canonical_name;
   }
-
-  if (canonical_name) {
-    // TODO(jnd) use a map to handle all customized {alias, canonical}
-    // encoding mappings if we have more than one pair.
-    // We don't want to add an unnecessary charset to the encoding menu, so we
-    // alias 'US-ASCII' to 'ISO-8859-1' in our UI without touching WebKit.
-    // http://crbug.com/15801.
-    if (alias_name == "US-ASCII")
-      return GetCanonicalEncodingNameByCommandId(IDC_ENCODING_ISO88591);
-    return canonical_name;
-  } else {
-    return std::string();
-  }
+  return std::string();
 }
 
 // Static
 // According to the behavior of user recently selected encoding short list in
 // Firefox, we always put UTF-8 as top position, after then put user
 // recent selected encodings, then put local dependent encoding items.
 // At last, we put all remaining encoding items.
 const std::vector<CharacterEncoding::EncodingInfo>*
     CharacterEncoding::GetCurrentDisplayEncodings(
     const std::string& locale,
@@ skipping 118 matching lines @@
   // Insert new encoding to head of selected encoding list.
   *selected_encodings = encoding_name;
   // Generate the string for rest selected encoding list.
   for (std::vector<int>::const_iterator it = selected_encoding_list.begin();
        it != selected_encoding_list.end(); ++it) {
     selected_encodings->append(1, L',');
     selected_encodings->append(GetCanonicalEncodingNameByCommandId(*it));
   }
   return true;
 }