japanese encoding webkit fixes for 3.0 branch

third_party/WebKit/WebCore/platform/text/TextEncoding.cpp

 /*
  * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 125 matching lines @@
 
 bool TextEncoding::usesVisualOrdering() const
 {
     if (noExtendedTextEncodingNameUsed())
         return false;
 
     static const char* const a = atomicCanonicalTextEncodingName("ISO-8859-8");
     return m_name == a;
 }
 
+#if !PLATFORM(CHROMIUM)
 bool TextEncoding::isJapanese() const
 {
     if (noExtendedTextEncodingNameUsed())
         return false;
 
     DEFINE_STATIC_LOCAL(HashSet<const char*>, set, ());
     if (set.isEmpty()) {
         addEncodingName(set, "x-mac-japanese");
         addEncodingName(set, "cp932");
         addEncodingName(set, "JIS_X0201");
         addEncodingName(set, "JIS_X0208-1983");
         addEncodingName(set, "JIS_X0208-1990");
         addEncodingName(set, "JIS_X0212-1990");
         addEncodingName(set, "JIS_C6226-1978");
         addEncodingName(set, "Shift_JIS_X0213-2000");
         addEncodingName(set, "ISO-2022-JP");
         addEncodingName(set, "ISO-2022-JP-2");
         addEncodingName(set, "ISO-2022-JP-1");
         addEncodingName(set, "ISO-2022-JP-3");
         addEncodingName(set, "EUC-JP");
         addEncodingName(set, "Shift_JIS");
     }
     return m_name && set.contains(m_name);
 }
+#endif
 
 UChar TextEncoding::backslashAsCurrencySymbol() const
 {
+#if PLATFORM(CHROMIUM)
+    // Chromium does not want this. The blog article cited is not
+    // a justification for replacing U+005C with U+00A5.
+    return '\\';
+#else
     if (noExtendedTextEncodingNameUsed())
         return '\\';
 
     // The text encodings below treat backslash as a currency symbol.
     // See http://blogs.msdn.com/michkap/archive/2005/09/17/469941.aspx for more information.
     static const char* const a = atomicCanonicalTextEncodingName("Shift_JIS_X0213-2000");
     static const char* const b = atomicCanonicalTextEncodingName("EUC-JP");
     return (m_name == a || m_name == b) ? 0x00A5 : '\\';
+#endif
 }
 
 bool TextEncoding::isNonByteBasedEncoding() const
 {
     if (noExtendedTextEncodingNameUsed()) {
         return *this == UTF16LittleEndianEncoding()
             || *this == UTF16BigEndianEncoding();
     }
 
     return *this == UTF16LittleEndianEncoding()
@@ skipping 71 matching lines @@
     return globalUTF8Encoding;
 }
 
 const TextEncoding& WindowsLatin1Encoding()
 {
     static TextEncoding globalWindowsLatin1Encoding("WinLatin-1");
     return globalWindowsLatin1Encoding;
 }
 
 } // namespace WebCore