Making Unicode character names consistent

Source/core/layout/line/InlineFlowBox.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 369 matching lines @@
     return logicalLeft;
 }
 
 FloatWillBeLayoutUnit InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* firstChild, InlineBox* lastChild,
     FloatWillBeLayoutUnit& logicalLeft, FloatWillBeLayoutUnit& minLogicalLeft, FloatWillBeLayoutUnit& maxLogicalRight, bool& needsWordSpacing)
 {
     for (InlineBox* curr = firstChild; curr && curr != lastChild; curr = curr->nextOnLine()) {
         if (curr->layoutObject().isText()) {
             InlineTextBox* text = toInlineTextBox(curr);
             LayoutText& rt = text->layoutObject();
-            FloatWillBeLayoutUnit space;
+            FloatWillBeLayoutUnit characterSpace;
             if (rt.textLength()) {
                 if (needsWordSpacing && isSpaceOrNewline(rt.characterAt(text->start())))
-                    space = rt.style(isFirstLineStyle())->font().fontDescription().wordSpacing();
+                    characterSpace = rt.style(isFirstLineStyle())->font().fontDescription().wordSpacing();
                 needsWordSpacing = !isSpaceOrNewline(rt.characterAt(text->end()));
             }
             if (isLeftToRightDirection()) {
-                logicalLeft += space;
+                logicalLeft += characterSpace;
                 text->setLogicalLeft(logicalLeft);
             } else {
                 text->setLogicalLeft(logicalLeft);
-                logicalLeft += space;
+                logicalLeft += characterSpace;
             }
             if (knownToHaveNoOverflow())
                 minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
             logicalLeft += text->logicalWidth();
             if (knownToHaveNoOverflow())
                 maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
         } else {
             if (curr->layoutObject().isOutOfFlowPositioned()) {
                 if (curr->layoutObject().parent()->style()->isLeftToRightDirection()) {
                     curr->setLogicalLeft(logicalLeft);
@@ skipping 21 matching lines @@
                 LayoutUnit logicalRightMargin = isHorizontal() ? curr->boxModelObject()->marginRight() : curr->boxModelObject()->marginBottom();
 
                 logicalLeft += logicalLeftMargin;
                 curr->setLogicalLeft(logicalLeft);
                 if (knownToHaveNoOverflow())
                     minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
                 logicalLeft += curr->logicalWidth();
                 if (knownToHaveNoOverflow())
                     maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
                 logicalLeft += logicalRightMargin;
-                // If we encounter any space after this inline block then ensure it is treated as the space between two words.
+                // If we encounter any characterSpace after this inline block then ensure it is treated as the characterSpace between two words.
                 needsWordSpacing = true;
             }
         }
     }
     return logicalLeft;
 }
 
 FontBaseline InlineFlowBox::dominantBaseline() const
 {
     // Use "central" (Ideographic) baseline if writing-mode is vertical-* and text-orientation is not sideways-*.
@@ skipping 34 matching lines @@
     // The primary purpose of this function is to compute the maximal ascent and descent values for
     // a line. These values are computed based off the block's line-box-contain property, which indicates
     // what parts of descendant boxes have to fit within the line.
     //
     // The maxAscent value represents the distance of the highest point of any box (typically including line-height) from
     // the root box's baseline. The maxDescent value represents the distance of the lowest point of any box
     // (also typically including line-height) from the root box baseline. These values can be negative.
     //
     // A secondary purpose of this function is to store the offset of every box's baseline from the root box's
     // baseline. This information is cached in the logicalTop() of every box. We're effectively just using
-    // the logicalTop() as scratch space.
+    // the logicalTop() as scratch characterSpace.
     //
     // Because a box can be positioned such that it ends up fully above or fully below the
     // root line box, we only consider it to affect the maxAscent and maxDescent values if some
     // part of the box (EXCLUDING leading) is above (for ascent) or below (for descent) the root box's baseline.
     bool affectsAscent = false;
     bool affectsDescent = false;
     bool checkChildren = !descendantsHaveSameLineHeightAndBaseline();
 
     if (isRootInlineBox()) {
         // Examine our root box.
@@ skipping 531 matching lines @@
         top = std::max(rootBox.lineTop(), top);
         logicalHeight = bottom - top;
     }
 
     // Move x/y to our coordinates.
     LayoutRect rect(minX, minY, width, height);
     flipForWritingMode(rect);
     rect.moveBy(accumulatedOffset);
 
     if (visibleToHitTestRequest(result.hitTestRequest()) && locationInContainer.intersects(rect)) {
-        layoutObject().updateHitTestResult(result, flipForWritingMode(locationInContainer.point() - toLayoutSize(accumulatedOffset))); // Don't add in m_x or m_y here, we want coords in the containing block's space.
+        layoutObject().updateHitTestResult(result, flipForWritingMode(locationInContainer.point() - toLayoutSize(accumulatedOffset))); // Don't add in m_x or m_y here, we want coords in the containing block's characterSpace.
         if (!result.addNodeToListBasedTestResult(layoutObject().node(), locationInContainer, rect))
             return true;
     }
 
     return false;
 }
 
 void InlineFlowBox::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
 {
     InlineFlowBoxPainter(*this).paint(paintInfo, paintOffset, lineTop, lineBottom);
@@ skipping 249 matching lines @@
         ASSERT(child->prevOnLine() == prev);
         prev = child;
     }
     ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 } // namespace blink