Index: Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp |
diff --git a/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp b/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp |
index a4f6854e804950ee3e9ea1dd7c6ec3092114d01a..051f63c540257edb7265d73e23d5c5e0fb65cbe3 100644 |
--- a/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp |
+++ b/Source/platform/fonts/harfbuzz/HarfBuzzShaper.cpp |
@@ -946,12 +946,12 @@ void HarfBuzzShaper::fillGlyphBufferFromHarfBuzzRun(GlyphBuffer* glyphBuffer, Ha |
if (currentCharacterIndex >= m_toIndex) |
m_startOffset.move(glyphAdvanceX, glyphAdvanceY); |
else if (currentCharacterIndex >= m_fromIndex) |
- glyphBuffer->add(glyphs[i], currentRun->fontData(), createGlyphBufferAdvance(glyphAdvanceX, glyphAdvanceY)); |
+ glyphBuffer->add(glyphs[i], currentRun->fontData(), FloatSize(glyphAdvanceX, glyphAdvanceY)); |
} else { |
if (currentCharacterIndex < m_fromIndex) |
m_startOffset.move(glyphAdvanceX, glyphAdvanceY); |
else if (currentCharacterIndex < m_toIndex) |
- glyphBuffer->add(glyphs[i], currentRun->fontData(), createGlyphBufferAdvance(glyphAdvanceX, glyphAdvanceY)); |
+ glyphBuffer->add(glyphs[i], currentRun->fontData(), FloatSize(glyphAdvanceX, glyphAdvanceY)); |
} |
} |
} |
@@ -1002,7 +1002,7 @@ void HarfBuzzShaper::fillGlyphBufferForTextEmphasis(GlyphBuffer* glyphBuffer, Ha |
for (unsigned j = 0; j < graphemesInCluster; ++j) { |
// Do not put emphasis marks on space, separator, and control characters. |
Glyph glyphToAdd = Character::canReceiveTextEmphasis(m_run[currentCharacterIndex]) ? 1 : 0; |
- glyphBuffer->add(glyphToAdd, currentRun->fontData(), createGlyphBufferAdvance(glyphAdvanceX, 0)); |
+ glyphBuffer->add(glyphToAdd, currentRun->fontData(), glyphAdvanceX); |
} |
clusterStart = clusterEnd; |
clusterAdvance = 0; |