Index: Source/platform/fonts/GlyphPageTreeNode.cpp |
diff --git a/Source/platform/fonts/GlyphPageTreeNode.cpp b/Source/platform/fonts/GlyphPageTreeNode.cpp |
index 6c1001d685b3c55752d3a4d44712696cb19c0fbb..31b55318b7dd5a6e2a9b8461f3e67d3071e4cb39 100644 |
--- a/Source/platform/fonts/GlyphPageTreeNode.cpp |
+++ b/Source/platform/fonts/GlyphPageTreeNode.cpp |
@@ -185,43 +185,43 @@ void GlyphPageTreeNode::initializePurePage(const FontData* fontData, unsigned pa |
if (start == 0) { |
// Control characters must not render at all. |
for (i = 0; i < 0x20; ++i) |
- buffer[i] = zeroWidthSpace; |
+ buffer[i] = characterZeroWidthSpace; |
for (i = 0x7F; i < 0xA0; i++) |
- buffer[i] = zeroWidthSpace; |
- buffer[softHyphen] = zeroWidthSpace; |
- |
- // \n and \t must render as a space. |
- buffer[newlineCharacter] = space; |
- buffer[characterTabulation] = space; |
- } else if (start == (arabicLetterMark & ~(GlyphPage::size - 1))) { |
- buffer[arabicLetterMark - start] = zeroWidthSpace; |
- } else if (start == (leftToRightMark & ~(GlyphPage::size - 1))) { |
+ buffer[i] = characterZeroWidthSpace; |
+ buffer[characterSoftHyphen] = characterZeroWidthSpace; |
+ |
+ // \n and \t must render as a characterSpace. |
+ buffer[characterNewline] = characterSpace; |
+ buffer[characterTabulation] = characterSpace; |
+ } else if (start == (characterArabicLetterMark & ~(GlyphPage::size - 1))) { |
+ buffer[characterArabicLetterMark - start] = characterZeroWidthSpace; |
+ } else if (start == (characterLeftToRightMark & ~(GlyphPage::size - 1))) { |
// LRM, RLM, LRE, RLE, ZWNJ, ZWJ, and PDF must not render at all. |
- buffer[leftToRightMark - start] = zeroWidthSpace; |
- buffer[rightToLeftMark - start] = zeroWidthSpace; |
- buffer[leftToRightEmbed - start] = zeroWidthSpace; |
- buffer[rightToLeftEmbed - start] = zeroWidthSpace; |
- buffer[leftToRightOverride - start] = zeroWidthSpace; |
- buffer[rightToLeftOverride - start] = zeroWidthSpace; |
- buffer[zeroWidthNonJoiner - start] = zeroWidthSpace; |
- buffer[zeroWidthJoiner - start] = zeroWidthSpace; |
- buffer[popDirectionalFormatting - start] = zeroWidthSpace; |
- buffer[activateArabicFormShaping - start] = zeroWidthSpace; |
- buffer[activateSymmetricSwapping - start] = zeroWidthSpace; |
- buffer[firstStrongIsolate - start] = zeroWidthSpace; |
- buffer[inhibitArabicFormShaping - start] = zeroWidthSpace; |
- buffer[inhibitSymmetricSwapping - start] = zeroWidthSpace; |
- buffer[leftToRightIsolate - start] = zeroWidthSpace; |
- buffer[nationalDigitShapes - start] = zeroWidthSpace; |
- buffer[nominalDigitShapes - start] = zeroWidthSpace; |
- buffer[popDirectionalIsolate - start] = zeroWidthSpace; |
- buffer[rightToLeftIsolate - start] = zeroWidthSpace; |
- } else if (start == (objectReplacementCharacter & ~(GlyphPage::size - 1))) { |
+ buffer[characterLeftToRightMark - start] = characterZeroWidthSpace; |
+ buffer[characterRightToLeftMark - start] = characterZeroWidthSpace; |
+ buffer[characterLeftToRightEmbed - start] = characterZeroWidthSpace; |
+ buffer[characterRightToLeftEmbed - start] = characterZeroWidthSpace; |
+ buffer[characterLeftToRightOverride - start] = characterZeroWidthSpace; |
+ buffer[characterRightToLeftOverride - start] = characterZeroWidthSpace; |
+ buffer[characterZeroWidthNonJoiner - start] = characterZeroWidthSpace; |
+ buffer[characterZeroWidthJoiner - start] = characterZeroWidthSpace; |
+ buffer[characterPopDirectionalFormatting - start] = characterZeroWidthSpace; |
+ buffer[characterActivateArabicFormShaping - start] = characterZeroWidthSpace; |
+ buffer[characterActivateSymmetricSwapping - start] = characterZeroWidthSpace; |
+ buffer[characterFirstStrongIsolate - start] = characterZeroWidthSpace; |
+ buffer[characterInhibitArabicFormShaping - start] = characterZeroWidthSpace; |
+ buffer[characterInhibitSymmetricSwapping - start] = characterZeroWidthSpace; |
+ buffer[characterLeftToRightIsolate - start] = characterZeroWidthSpace; |
+ buffer[characterNationalDigitShapes - start] = characterZeroWidthSpace; |
+ buffer[characterNominalDigitShapes - start] = characterZeroWidthSpace; |
+ buffer[characterPopDirectionalIsolate - start] = characterZeroWidthSpace; |
+ buffer[characterRightToLeftIsolate - start] = characterZeroWidthSpace; |
+ } else if (start == (characterObjectReplacement & ~(GlyphPage::size - 1))) { |
// Object replacement character must not render at all. |
- buffer[objectReplacementCharacter - start] = zeroWidthSpace; |
- } else if (start == (zeroWidthNoBreakSpace & ~(GlyphPage::size - 1))) { |
+ buffer[characterObjectReplacement - start] = characterZeroWidthSpace; |
+ } else if (start == (characterZeroWidthNoBreakSpace & ~(GlyphPage::size - 1))) { |
// ZWNBS/BOM must not render at all. |
- buffer[zeroWidthNoBreakSpace - start] = zeroWidthSpace; |
+ buffer[characterZeroWidthNoBreakSpace - start] = characterZeroWidthSpace; |
} |
} else { |
bufferLength = GlyphPage::size * 2; |