| Index: Source/platform/fonts/mac/ComplexTextController.cpp
|
| diff --git a/Source/platform/fonts/mac/ComplexTextController.cpp b/Source/platform/fonts/mac/ComplexTextController.cpp
|
| index 652835589dc2f9131852360900bcb620b9476a69..49fa0e8e84645e166943bada2a5ae8f17a239224 100644
|
| --- a/Source/platform/fonts/mac/ComplexTextController.cpp
|
| +++ b/Source/platform/fonts/mac/ComplexTextController.cpp
|
| @@ -68,9 +68,9 @@ ComplexTextController::ComplexTextController(const Font* font, const TextRun& ru
|
| bool isAfterExpansion = m_afterExpansion;
|
| unsigned expansionOpportunityCount;
|
| if (m_run.is8Bit())
|
| - expansionOpportunityCount = Character::expansionOpportunityCount(m_run.characters8(), m_end, m_run.direction(), isAfterExpansion);
|
| + expansionOpportunityCount = Character::expansionOpportunityCount(m_run.characters8(), m_end, m_run.direction(), isAfterExpansion, m_run.textJustify());
|
| else
|
| - expansionOpportunityCount = Character::expansionOpportunityCount(m_run.characters16(), m_end, m_run.direction(), isAfterExpansion);
|
| + expansionOpportunityCount = Character::expansionOpportunityCount(m_run.characters16(), m_end, m_run.direction(), isAfterExpansion, m_run.textJustify());
|
| if (isAfterExpansion && !m_run.allowsTrailingExpansion())
|
| expansionOpportunityCount--;
|
|
|
|
|