Making Unicode character names consistent

Source/core/paint/BoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/BoxPainter.h"
 
 #include "core/HTMLNames.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
@@ skipping 644 matching lines @@
                 isOpaque = !obj.document().hasSVGRootNode();
             }
         }
     } else if (obj.view()->frameView()) {
         isOpaque = !obj.view()->frameView()->isTransparent();
     }
 
     return isOpaque;
 }
 
-// Return the amount of space to leave between image tiles for the background-repeat: space property.
+// Return the amount of characterSpace to leave between image tiles for the background-repeat: characterSpace property.

[jsbell, 2015/05/05 17:29:53]

This comment change is bogus

 static inline int getSpaceBetweenImageTiles(int areaSize, int tileSize)
 {
     int numberOfTiles = areaSize / tileSize;
-    int space = -1;
+    int characterSpace = -1;

[jsbell, 2015/05/05 17:29:53]

This change is incorrect - it's a local variable, not the shared constant.

 
     if (numberOfTiles > 1) {
         // Spec doesn't specify rounding, so use the same method as for background-repeat: round.
-        space = lroundf((areaSize - numberOfTiles * tileSize) / (float)(numberOfTiles - 1));
+        characterSpace = lroundf((areaSize - numberOfTiles * tileSize) / (float)(numberOfTiles - 1));
     }
 
-    return space;
+    return characterSpace;
 }
 
 void BoxPainter::calculateBackgroundImageGeometry(LayoutBoxModelObject& obj, const LayoutBoxModelObject* paintContainer, const FillLayer& fillLayer, const LayoutRect& paintRect,
     BackgroundImageGeometry& geometry, LayoutObject* backgroundObject)
 {
     LayoutUnit left = 0;
     LayoutUnit top = 0;
     IntSize positioningAreaSize;
     IntRect snappedPaintRect = pixelSnappedIntRect(paintRect);
 
@@ skipping 102 matching lines @@
 
         geometry.setTileSize(fillTileSize);
         geometry.setPhaseY(geometry.tileSize().height() ? geometry.tileSize().height() - roundToInt(computedYPosition + top) % geometry.tileSize().height() : 0);
         geometry.setSpaceSize(IntSize());
     }
 
     if (backgroundRepeatX == RepeatFill) {
         geometry.setPhaseX(geometry.tileSize().width() ? geometry.tileSize().width() - roundToInt(computedXPosition + left) % geometry.tileSize().width() : 0);
         geometry.setSpaceSize(IntSize());
     } else if (backgroundRepeatX == SpaceFill && fillTileSize.width() > 0) {
-        int space = getSpaceBetweenImageTiles(positioningAreaSize.width(), geometry.tileSize().width());
-        int actualWidth = geometry.tileSize().width() + space;
+        int characterSpace = getSpaceBetweenImageTiles(positioningAreaSize.width(), geometry.tileSize().width());

[jsbell, 2015/05/05 17:29:53]

Ditto.

+        int actualWidth = geometry.tileSize().width() + characterSpace;
 
-        if (space >= 0) {
+        if (characterSpace >= 0) {
             computedXPosition = roundedMinimumValueForLength(Length(), availableWidth);
-            geometry.setSpaceSize(IntSize(space, 0));
+            geometry.setSpaceSize(IntSize(characterSpace, 0));
             geometry.setPhaseX(actualWidth ? actualWidth - roundToInt(computedXPosition + left) % actualWidth : 0);
         } else {
             backgroundRepeatX = NoRepeatFill;
         }
     }
     if (backgroundRepeatX == NoRepeatFill) {
         int xOffset = fillLayer.backgroundXOrigin() == RightEdge ? availableWidth - computedXPosition : computedXPosition;
         geometry.setNoRepeatX(left + xOffset);
         geometry.setSpaceSize(IntSize(0, geometry.spaceSize().height()));
     }
 
     if (backgroundRepeatY == RepeatFill) {
         geometry.setPhaseY(geometry.tileSize().height() ? geometry.tileSize().height() - roundToInt(computedYPosition + top) % geometry.tileSize().height() : 0);
         geometry.setSpaceSize(IntSize(geometry.spaceSize().width(), 0));
     } else if (backgroundRepeatY == SpaceFill && fillTileSize.height() > 0) {
-        int space = getSpaceBetweenImageTiles(positioningAreaSize.height(), geometry.tileSize().height());
-        int actualHeight = geometry.tileSize().height() + space;
+        int characterSpace = getSpaceBetweenImageTiles(positioningAreaSize.height(), geometry.tileSize().height());

[jsbell, 2015/05/05 17:29:53]

Ditto.

+        int actualHeight = geometry.tileSize().height() + characterSpace;
 
-        if (space >= 0) {
+        if (characterSpace >= 0) {
             computedYPosition = roundedMinimumValueForLength(Length(), availableHeight);
-            geometry.setSpaceSize(IntSize(geometry.spaceSize().width(), space));
+            geometry.setSpaceSize(IntSize(geometry.spaceSize().width(), characterSpace));
             geometry.setPhaseY(actualHeight ? actualHeight - roundToInt(computedYPosition + top) % actualHeight : 0);
         } else {
             backgroundRepeatY = NoRepeatFill;
         }
     }
     if (backgroundRepeatY == NoRepeatFill) {
         int yOffset = fillLayer.backgroundYOrigin() == BottomEdge ? availableHeight - computedYPosition : computedYPosition;
         geometry.setNoRepeatY(top + yOffset);
         geometry.setSpaceSize(IntSize(geometry.spaceSize().width(), 0));
     }
@@ skipping 1458 matching lines @@
 
     FloatPoint secondQuad[4];
     secondQuad[0] = quad[0];
     secondQuad[1] = FloatPoint(quad[0].x() - r1 * cx, quad[0].y() - r1 * cy);
     secondQuad[2] = quad[2];
     secondQuad[3] = quad[3];
     graphicsContext->clipPolygon(4, secondQuad, !secondEdgeMatches);
 }
 
 } // namespace blink