Making Unicode character names consistent

Source/platform/fonts/shaping/HarfBuzzShaper.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 345 matching lines @@
         stringFor8BitRun = String::make16BitFrom8BitSource(run.characters8(), run.length());
         source = stringFor8BitRun.characters16();
     } else {
         source = run.characters16();
     }
 
     *destinationLength = 0;
     while (position < length) {
         UChar32 character;
         U16_NEXT(source, position, length, character);
-        // Don't normalize tabs as they are not treated as spaces for word-end.
+        // Don't normalize tabs as they are not treated as characterSpaces for word-end.
         if (run.normalizeSpace() && Character::isNormalizedCanvasSpaceCharacter(character))
-            character = space;
+            character = characterSpace;
         else if (Character::treatAsSpace(character) && character != characterTabulation)
-            character = space;
+            character = characterSpace;
         else if (Character::treatAsZeroWidthSpaceInComplexScript(character))
-            character = zeroWidthSpace;
+            character = characterZeroWidthSpace;
 
         U16_APPEND(destination, *destinationLength, length, character, error);
         ASSERT_UNUSED(error, !error);
     }
 }
 
 HarfBuzzShaper::HarfBuzzShaper(const Font* font, const TextRun& run, const GlyphData* emphasisData,
     HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* bounds)
     : Shaper(font, run, emphasisData, fallbackFonts, bounds)
     , m_normalizedBufferLength(0)
@@ skipping 204 matching lines @@
             if ((U_GET_GC_MASK(character) & U_GC_M_MASK)
                 && currentFontData->canRenderCombiningCharacterSequence(
                     currentCharacterPosition,
                     iterator.glyphEnd() - currentCharacterPosition))
                 continue;
 
             nextFontData = font->glyphDataForCharacter(character, false, isSpaceNormalize).fontData;
             nextScript = uscript_getScript(character, &errorCode);
             if (U_FAILURE(errorCode))
                 return false;
-            if (lastCharacter == zeroWidthJoiner)
+            if (lastCharacter == characterZeroWidthJoiner)
                 currentFontData = nextFontData;
             if ((nextFontData != currentFontData) || ((currentScript != nextScript) && (nextScript != USCRIPT_INHERITED) && (!uscript_hasScript(character, currentScript))))
                 break;
             currentCharacterPosition = iterator.characters();
             lastCharacter = character;
         }
 
         CandidateRun run = { character, startIndexOfCurrentRun, static_cast<unsigned>(iterator.offset()), currentFontData, currentScript };
         runs->append(run);
 
@@ skipping 237 matching lines @@
                 setGlyphPositionsForHarfBuzzRun(currentRun,
                     cachedResults->buffer, previousRun);
                 hb_buffer_clear_contents(harfBuzzBuffer.get());
                 runCache.moveToBack(cachedResults);
                 previousRun = currentRun;
                 continue;
             }
             runCache.remove(cachedResults);
         }
 
-        // Add a space as pre-context to the buffer. This prevents showing dotted-circle
+        // Add a characterSpace as pre-context to the buffer. This prevents showing dotted-circle

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

While technically correct, I would not make this comment change.

[h.joshi, 2015/05/11 07:06:32]

Done.

         // for combining marks at the beginning of runs.
-        static const uint16_t preContext = space;
+        static const uint16_t preContext = characterSpace;
         hb_buffer_add_utf16(harfBuzzBuffer.get(), &preContext, 1, 1, 0);
 
         addToHarfBuzzBufferInternal(harfBuzzBuffer.get(),
             fontDescription, m_normalizedBuffer.get(), currentRun->startIndex(),
             currentRun->numCharacters());
 
         if (fontDescription.isVerticalAnyUpright())
             face->setScriptForVerticalGlyphSubstitution(harfBuzzBuffer.get());
 
         HarfBuzzScopedPtr<hb_font_t> harfBuzzFont(face->createFont(), hb_font_destroy);
@@ skipping 222 matching lines @@
                 clusterEnd = currentCharacterIndex;
             else
                 clusterEnd = isRunEnd ? currentRun->startIndex() + currentRun->numCharacters() : currentRun->startIndex() + glyphToCharacterIndexes[i + 1];
 
             graphemesInCluster = countGraphemesInCluster(m_normalizedBuffer.get(), m_normalizedBufferLength, clusterStart, clusterEnd);
             if (!graphemesInCluster || !clusterAdvance)
                 continue;
 
             float glyphAdvanceX = clusterAdvance / graphemesInCluster;
             for (unsigned j = 0; j < graphemesInCluster; ++j) {
-                // Do not put emphasis marks on space, separator, and control characters.
+                // Do not put emphasis marks on characterSpace, separator, and control characters.

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

This comment change is incorrect.

[h.joshi, 2015/05/11 07:06:32]

Done.

                 if (Character::canReceiveTextEmphasis(m_run[currentCharacterIndex]))
                     addEmphasisMark(glyphBuffer, advanceSoFar + glyphAdvanceX / 2);
 
                 advanceSoFar += glyphAdvanceX;
             }
             clusterStart = clusterEnd;
             clusterAdvance = 0;
         }
     }
 
@@ skipping 95 matching lines @@
     // possibly invalid from, to arguments.
     if (!foundToX && !foundFromX)
         fromX = toX = 0;
 
     if (fromX < toX)
         return FloatRect(point.x() + fromX, point.y(), toX - fromX, height);
     return FloatRect(point.x() + toX, point.y(), fromX - toX, height);
 }
 
 } // namespace blink