Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Unified Diff: Source/platform/fonts/shaping/SimpleShaper.cpp

Issue 1119663002: Making Unicode character names consistent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code changes to correct Test Expectation Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/fonts/shaping/SimpleShaper.cpp
diff --git a/Source/platform/fonts/shaping/SimpleShaper.cpp b/Source/platform/fonts/shaping/SimpleShaper.cpp
index 6bda31c4b6a76d771fc076386455945ad1d74f52..2feb5525ff78eaa531ca11b4b69db2f3f7fce5d6 100644
--- a/Source/platform/fonts/shaping/SimpleShaper.cpp
+++ b/Source/platform/fonts/shaping/SimpleShaper.cpp
@@ -113,7 +113,7 @@ float SimpleShaper::adjustSpacing(float width, const CharacterData& charData)
// Account for word spacing.
// We apply additional space between "words" by adding width to the space character.
if (isExpansionOpportunity && (charData.character != characterTabulation || !m_run.allowTabs())
- && (charData.characterOffset || charData.character == noBreakSpace)
+ && (charData.characterOffset || charData.character == characterNoBreakSpace)
&& m_font->fontDescription().wordSpacing()) {
width += m_font->fontDescription().wordSpacing();
}
@@ -145,7 +145,7 @@ unsigned SimpleShaper::advanceInternal(TextIterator& textIterator, GlyphBuffer*
float width;
bool spaceUsedAsZeroWidthSpace = false;
if (!glyphData.glyph && Character::treatAsZeroWidthSpace(charData.character)) {
- charData.character = space;
+ charData.character = characterSpace;
glyphData = glyphDataForCharacter(charData);
width = 0;
spaceUsedAsZeroWidthSpace = true;

Powered by Google App Engine
This is Rietveld 408576698