Making Unicode character names consistent

Source/core/editing/htmlediting.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 366 matching lines @@
     bool previousCharacterWasSpace = false;
     for (size_t i = 0; i < length; i++) {
         UChar c = string[i];
         if (!isWhitespace(c)) {
             rebalancedString.append(c);
             previousCharacterWasSpace = false;
             continue;
         }
 
         if (previousCharacterWasSpace || (!i && startIsStartOfParagraph) || (i + 1 == length && endIsEndOfParagraph)) {
-            rebalancedString.append(noBreakSpace);
+            rebalancedString.append(noBreakSpaceCharacter);
             previousCharacterWasSpace = false;
         } else {
             rebalancedString.append(' ');
             previousCharacterWasSpace = true;
         }
     }
 
     ASSERT(rebalancedString.length() == length);
 
     return rebalancedString.toString();
 }
 
 bool isTableStructureNode(const Node *node)
 {
     LayoutObject* layoutObject = node->layoutObject();
     return (layoutObject && (layoutObject->isTableCell() || layoutObject->isTableRow() || layoutObject->isTableSection() || layoutObject->isLayoutTableCol()));
 }
 
 const String& nonBreakingSpaceString()
 {
-    DEFINE_STATIC_LOCAL(String, nonBreakingSpaceString, (&noBreakSpace, 1));
+    DEFINE_STATIC_LOCAL(String, nonBreakingSpaceString, (&noBreakSpaceCharacter, 1));
     return nonBreakingSpaceString;
 }
 
 // FIXME: need to dump this
 static bool isSpecialHTMLElement(const Node& n)
 {
     if (!n.isHTMLElement())
         return false;
 
     if (n.isLink())
@@ skipping 492 matching lines @@
     if (position.isNull())
         return Position();
 
     if (isHTMLBRElement(*position.upstream().anchorNode()))
         return Position();
 
     Position prev = previousCharacterPosition(position, affinity);
     if (prev != position && inSameContainingBlockFlowElement(prev.anchorNode(), position.anchorNode()) && prev.anchorNode()->isTextNode()) {
         String string = toText(prev.anchorNode())->data();
         UChar previousCharacter = string[prev.deprecatedEditingOffset()];
-        bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(previousCharacter) || previousCharacter == noBreakSpace) : isCollapsibleWhitespace(previousCharacter);
+        bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(previousCharacter) || previousCharacter == noBreakSpaceCharacter) : isCollapsibleWhitespace(previousCharacter);
         if (isSpace && isEditablePosition(prev))
             return prev;
     }
 
     return Position();
 }
 
 // This assumes that it starts in editable content.
 Position trailingWhitespacePosition(const Position& position, EAffinity, WhitespacePositionOption option)
 {
     ASSERT(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle));
     if (position.isNull())
         return Position();
 
     VisiblePosition visiblePosition(position);
     UChar characterAfterVisiblePosition = visiblePosition.characterAfter();
-    bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(characterAfterVisiblePosition) || characterAfterVisiblePosition == noBreakSpace) : isCollapsibleWhitespace(characterAfterVisiblePosition);
+    bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(characterAfterVisiblePosition) || characterAfterVisiblePosition == noBreakSpaceCharacter) : isCollapsibleWhitespace(characterAfterVisiblePosition);
     // The space must not be in another paragraph and it must be editable.
     if (isSpace && !isEndOfParagraph(visiblePosition) && visiblePosition.next(CannotCrossEditingBoundary).isNotNull())
         return position;
     return Position();
 }
 
 unsigned numEnclosingMailBlockquotes(const Position& p)
 {
     unsigned num = 0;
     for (Node* n = p.deprecatedNode(); n; n = n->parentNode())
@@ skipping 233 matching lines @@
     // if the selection starts just before a paragraph break, skip over it
     if (isEndOfParagraph(visiblePosition))
         return visiblePosition.next().deepEquivalent().downstream();
 
     // otherwise, make sure to be at the start of the first selected node,
     // instead of possibly at the end of the last node before the selection
     return visiblePosition.deepEquivalent().downstream();
 }
 
 } // namespace blink