Making Unicode character names consistent

Source/platform/fonts/shaping/SimpleShaper.cpp

 /*
  * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 54 matching lines @@
 {
     ASSERT(m_font);
     return m_font->glyphDataForCharacter(charData.character, m_run.rtl(), normalizeSpace);
 }
 
 float SimpleShaper::characterWidth(UChar32 character, const GlyphData& glyphData) const
 {
     const SimpleFontData* fontData = glyphData.fontData;
     ASSERT(fontData);
 
-    if (UNLIKELY(character == characterTabulation && m_run.allowTabs()))
+    if (UNLIKELY(character == tabulationCharacter && m_run.allowTabs()))
         return m_font->tabWidth(*fontData, m_run.tabSize(), m_run.xPos() + m_runWidthSoFar);
 
     float width = fontData->widthForGlyph(glyphData.glyph);
 
     // SVG uses horizontalGlyphStretch(), when textLength is used to stretch/squeeze text.
     if (UNLIKELY(m_run.horizontalGlyphStretch() != 1))
         width *= m_run.horizontalGlyphStretch();
 
     return width;
 }
@@ skipping 19 matching lines @@
                 m_expansion -= m_expansionPerOpportunity;
                 width += m_expansionPerOpportunity;
                 m_isAfterExpansion = true;
             }
         } else {
             m_isAfterExpansion = false;
         }
 
         // Account for word spacing.
         // We apply additional space between "words" by adding width to the space character.
-        if (isExpansionOpportunity && (charData.character != characterTabulation || !m_run.allowTabs())
-            && (charData.characterOffset || charData.character == noBreakSpace)
+        if (isExpansionOpportunity && (charData.character != tabulationCharacter || !m_run.allowTabs())
+            && (charData.characterOffset || charData.character == noBreakSpaceCharacter)
             && m_font->fontDescription().wordSpacing()) {
             width += m_font->fontDescription().wordSpacing();
         }
     } else {
         m_isAfterExpansion = false;
     }
 
     return width;
 }
 
@@ skipping 11 matching lines @@
     while (textIterator.consume(charData.character)) {
         charData.characterOffset = textIterator.offset();
         charData.clusterLength = textIterator.glyphLength();
         GlyphData glyphData = glyphDataForCharacter(charData, normalizeSpace);
 
         // Some fonts do not have a glyph for zero-width-space,
         // in that case use the space character and override the width.
         float width;
         bool spaceUsedAsZeroWidthSpace = false;
         if (!glyphData.glyph && Character::treatAsZeroWidthSpace(charData.character)) {
-            charData.character = space;
+            charData.character = spaceCharacter;
             glyphData = glyphDataForCharacter(charData);
             width = 0;
             spaceUsedAsZeroWidthSpace = true;
         } else {
             width = characterWidth(charData.character, glyphData);
         }
 
         Glyph glyph = glyphData.glyph;
         const SimpleFontData* fontData = glyphData.fontData;
         ASSERT(fontData);
@@ skipping 60 matching lines @@
     float initialWidth = m_runWidthSoFar;
 
     if (!advance(m_currentCharacter + 1))
         return false;
 
     width = m_runWidthSoFar - initialWidth;
     return true;
 }
 
 } // namespace blink