Making Unicode character names consistent

Source/platform/text/UnicodeUtilities.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov.
  *
  * 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 27 matching lines @@
 enum VoicedSoundMarkType {
     NoVoicedSoundMark,
     VoicedSoundMark,
     SemiVoicedSoundMark
 };
 
 template <typename CharType>
 static inline CharType foldQuoteMarkOrSoftHyphen(CharType c)
 {
     switch (static_cast<UChar>(c)) {
-    case hebrewPunctuationGershayim:
-    case leftDoubleQuotationMark:
-    case rightDoubleQuotationMark:
+    case hebrewPunctuationGershayimCharacter:
+    case leftDoubleQuotationMarkCharacter:
+    case rightDoubleQuotationMarkCharacter:
         return '"';
-    case hebrewPunctuationGeresh:
-    case leftSingleQuotationMark:
-    case rightSingleQuotationMark:
+    case hebrewPunctuationGereshCharacter:
+    case leftSingleQuotationMarkCharacter:
+    case rightSingleQuotationMarkCharacter:
         return '\'';
-    case softHyphen:
+    case softHyphenCharacter:
         // Replace soft hyphen with an ignorable character so that their presence or absence will
         // not affect string comparison.
         return 0;
     default:
         return c;
     }
 }
 
 void foldQuoteMarksAndSoftHyphens(UChar* data, size_t length)
 {
     for (size_t i = 0; i < length; ++i)
         data[i] = foldQuoteMarkOrSoftHyphen(data[i]);
 }
 
 void foldQuoteMarksAndSoftHyphens(String& s)
 {
-    s.replace(hebrewPunctuationGeresh, '\'');
-    s.replace(hebrewPunctuationGershayim, '"');
-    s.replace(leftDoubleQuotationMark, '"');
-    s.replace(leftSingleQuotationMark, '\'');
-    s.replace(rightDoubleQuotationMark, '"');
-    s.replace(rightSingleQuotationMark, '\'');
+    s.replace(hebrewPunctuationGereshCharacter, '\'');
+    s.replace(hebrewPunctuationGershayimCharacter, '"');
+    s.replace(leftDoubleQuotationMarkCharacter, '"');
+    s.replace(leftSingleQuotationMarkCharacter, '\'');
+    s.replace(rightDoubleQuotationMarkCharacter, '"');
+    s.replace(rightSingleQuotationMarkCharacter, '\'');
     // Replace soft hyphen with an ignorable character so that their presence or absence will
     // not affect string comparison.
-    s.replace(softHyphen, 0);
+    s.replace(softHyphenCharacter, 0);
 }
 
 static bool isNonLatin1Separator(UChar32 character)
 {
     ASSERT_ARG(character, character >= 256);
 
     return U_GET_GC_MASK(character) & (U_GC_S_MASK | U_GC_P_MASK | U_GC_Z_MASK | U_GC_CF_MASK);
 }
 
 bool isSeparator(UChar32 character)
@@ skipping 314 matching lines @@
         if (offset == kNotFound)
             return false;
 
         // Update values of |a| and |b| after comparing.
         a += offset;
         b += offset;
     }
 }
 
 }