Making Unicode character names consistent

Source/platform/fonts/Character.h

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 43 matching lines @@
     static bool isCJKIdeograph(UChar32);
     static bool isCJKIdeographOrSymbol(UChar32);
 
     static unsigned expansionOpportunityCount(const LChar*, size_t length, TextDirection, bool& isAfterExpansion, const TextJustify);
     static unsigned expansionOpportunityCount(const UChar*, size_t length, TextDirection, bool& isAfterExpansion, const TextJustify);
 
     static bool shouldIgnoreRotation(UChar32 character);
 
     static bool treatAsSpace(UChar c)
     {
-        return c == space
-            || c == characterTabulation
+        return c == spaceCharacter
+            || c == tabulationCharacter
             || c == newlineCharacter
-            || c == noBreakSpace;
+            || c == noBreakSpaceCharacter;
     }
     static bool treatAsZeroWidthSpace(UChar c)
     {
         return treatAsZeroWidthSpaceInComplexScript(c)
-            || c == zeroWidthNonJoiner
-            || c == zeroWidthJoiner;
+            || c == zeroWidthNonJoinerCharacter
+            || c == zeroWidthJoinerCharacter;
     }
     static bool treatAsZeroWidthSpaceInComplexScript(UChar c)
     {
         return c < 0x20 // ASCII Control Characters
-            || (c >= 0x7F && c < 0xA0) // ASCII Delete .. No-break space
-            || c == softHyphen
-            || c == zeroWidthSpace
-            || (c >= leftToRightMark && c <= rightToLeftMark)
-            || (c >= leftToRightEmbed && c <= rightToLeftOverride)
-            || c == zeroWidthNoBreakSpace
+            || (c >= 0x7F && c < 0xA0) // ASCII Delete .. No-break spaceCharacter
+            || c == softHyphenCharacter
+            || c == zeroWidthSpaceCharacter
+            || (c >= leftToRightMarkCharacter && c <= rightToLeftMarkCharacter)
+            || (c >= leftToRightEmbedCharacter && c <= rightToLeftOverrideCharacter)
+            || c == zeroWidthNoBreakSpaceCharacter
             || c == objectReplacementCharacter;
     }
     static bool canReceiveTextEmphasis(UChar32);
 
     static inline UChar normalizeSpaces(UChar character)
     {
         if (treatAsSpace(character))
-            return space;
+            return spaceCharacter;
 
         if (treatAsZeroWidthSpace(character))
-            return zeroWidthSpace;
+            return zeroWidthSpaceCharacter;
 
         return character;
     }
 
     static inline bool isNormalizedCanvasSpaceCharacter(UChar c)
     {
         // According to specification all space characters should be replaced with 0x0020 space character.
         // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#text-preparation-algorithm
         // The space characters according to specification are : U+0020, U+0009, U+000A, U+000C, and U+000D.
         // http://www.whatwg.org/specs/web-apps/current-work/multipage/common-microsyntaxes.html#space-character
         // This function returns true for 0x000B also, so that this is backward compatible.
         // Otherwise, the test LayoutTests/canvas/philip/tests/2d.text.draw.space.collapse.space.html will fail
         return c == 0x0009 || (c >= 0x000A && c <= 0x000D);
     }
 
     static String normalizeSpaces(const LChar*, unsigned length);
     static String normalizeSpaces(const UChar*, unsigned length);
 
 private:
     Character();
 };
 
 } // namespace blink
 
 #endif