Making Unicode character names consistent

Source/core/html/HTMLTextFormControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * 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
@@ skipping 101 matching lines @@
     if (event->type() == EventTypeNames::blur || event->type() == EventTypeNames::focus)
         return;
     innerEditorElement()->defaultEventHandler(event);
 }
 
 String HTMLTextFormControlElement::strippedPlaceholder() const
 {
     // According to the HTML5 specification, we need to remove CR and LF from
     // the attribute value.
     const AtomicString& attributeValue = fastGetAttribute(placeholderAttr);
-    if (!attributeValue.contains(newlineCharacter) && !attributeValue.contains(carriageReturn))
+    if (!attributeValue.contains(characterNewline) && !attributeValue.contains(characterCarriageReturn))
         return attributeValue;
 
     StringBuilder stripped;
     unsigned length = attributeValue.length();
     stripped.reserveCapacity(length);
     for (unsigned i = 0; i < length; ++i) {
         UChar character = attributeValue[i];
-        if (character == newlineCharacter || character == carriageReturn)
+        if (character == characterNewline || character == characterCarriageReturn)
             continue;
         stripped.append(character);
     }
     return stripped.toString();
 }
 
-static bool isNotLineBreak(UChar ch) { return ch != newlineCharacter && ch != carriageReturn; }
+static bool isNotLineBreak(UChar ch) { return ch != characterNewline && ch != characterCarriageReturn; }
 
 bool HTMLTextFormControlElement::isPlaceholderEmpty() const
 {
     const AtomicString& attributeValue = fastGetAttribute(placeholderAttr);
     return attributeValue.string().find(isNotLineBreak) == kNotFound;
 }
 
 bool HTMLTextFormControlElement::placeholderShouldBeVisible() const
 {
     return supportsPlaceholder()
@@ skipping 503 matching lines @@
 String HTMLTextFormControlElement::innerEditorValue() const
 {
     ASSERT(!hasOpenShadowRoot());
     HTMLElement* innerEditor = innerEditorElement();
     if (!innerEditor || !isTextFormControl())
         return emptyString();
 
     StringBuilder result;
     for (Node& node : NodeTraversal::inclusiveDescendantsOf(*innerEditor)) {
         if (isHTMLBRElement(node))
-            result.append(newlineCharacter);
+            result.append(characterNewline);
         else if (node.isTextNode())
             result.append(toText(node).data());
     }
     return finishText(result);
 }
 
 static void getNextSoftBreak(RootInlineBox*& line, Node*& breakNode, unsigned& breakOffset)
 {
     RootInlineBox* next;
     for (; line; line = next) {
@@ skipping 26 matching lines @@
     unsigned breakOffset;
     RootInlineBox* line = layoutObject->firstRootBox();
     if (!line)
         return value();
 
     getNextSoftBreak(line, breakNode, breakOffset);
 
     StringBuilder result;
     for (Node& node : NodeTraversal::descendantsOf(*innerText)) {
         if (isHTMLBRElement(node)) {
-            result.append(newlineCharacter);
+            result.append(characterNewline);
         } else if (node.isTextNode()) {
             String data = toText(node).data();
             unsigned length = data.length();
             unsigned position = 0;
             while (breakNode == node && breakOffset <= length) {
                 if (breakOffset > position) {
                     result.append(data, position, breakOffset - position);
                     position = breakOffset;
-                    result.append(newlineCharacter);
+                    result.append(characterNewline);
                 }
                 getNextSoftBreak(line, breakNode, breakOffset);
             }
             result.append(data, position, length - position);
         }
         while (breakNode == node)
             getNextSoftBreak(line, breakNode, breakOffset);
     }
     return finishText(result);
 }
@@ skipping 279 matching lines @@
 }
 
 void HTMLTextFormControlElement::copyNonAttributePropertiesFromElement(const Element& source)
 {
     const HTMLTextFormControlElement& sourceElement = static_cast<const HTMLTextFormControlElement&>(source);
     m_lastChangeWasUserEdit = sourceElement.m_lastChangeWasUserEdit;
     HTMLFormControlElement::copyNonAttributePropertiesFromElement(source);
 }
 
 } // namespace blink