Index: Source/platform/fonts/mac/ComplexTextController.cpp |
diff --git a/Source/platform/fonts/mac/ComplexTextController.cpp b/Source/platform/fonts/mac/ComplexTextController.cpp |
index 57855a55b5ed444de4c1de337440a867e9d792fd..7e570276bb43c4d849529774bb38f11bade0a047 100644 |
--- a/Source/platform/fonts/mac/ComplexTextController.cpp |
+++ b/Source/platform/fonts/mac/ComplexTextController.cpp |
@@ -134,16 +134,18 @@ ComplexTextController::ComplexTextController(const Font* font, const TextRun& ru |
, m_minGlyphBoundingBoxY(numeric_limits<float>::max()) |
, m_maxGlyphBoundingBoxY(numeric_limits<float>::min()) |
, m_lastRoundingGlyph(0) |
+ , m_distributeJustification(false) |
{ |
if (!m_expansion) |
m_expansionPerOpportunity = 0; |
else { |
bool isAfterExpansion = m_afterExpansion; |
unsigned expansionOpportunityCount; |
+ m_distributeJustification = m_run.isDistributeJustification(); |
if (m_run.is8Bit()) |
- expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters8(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion); |
+ expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters8(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion, m_distributeJustification); |
else |
- expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters16(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion); |
+ expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters16(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion, m_distributeJustification); |
if (isAfterExpansion && !m_run.allowsTrailingExpansion()) |
expansionOpportunityCount--; |