| Index: Source/platform/fonts/mac/ComplexTextController.cpp
|
| diff --git a/Source/platform/fonts/mac/ComplexTextController.cpp b/Source/platform/fonts/mac/ComplexTextController.cpp
|
| index 75353ad5c12d70c4813b20105554011afe3e2c74..e325daebffd8559ea5653682f54aa138d3e9a9f8 100644
|
| --- a/Source/platform/fonts/mac/ComplexTextController.cpp
|
| +++ b/Source/platform/fonts/mac/ComplexTextController.cpp
|
| @@ -244,7 +244,7 @@ void ComplexTextController::collectComplexTextRuns()
|
| } else
|
| cp = m_run.characters16();
|
|
|
| - if (m_font.fontDescription().variant())
|
| + if (m_font.fontDescription().variant() == FontVariantSmallCaps)
|
| m_smallCapsBuffer.resize(m_end);
|
|
|
| unsigned indexOfFontTransition = 0;
|
| @@ -265,7 +265,7 @@ void ComplexTextController::collectComplexTextRuns()
|
| UChar uppercaseCharacter = 0;
|
|
|
| bool isSmallCaps;
|
| - bool nextIsSmallCaps = m_font.fontDescription().variant() && !(U_GET_GC_MASK(baseCharacter) & U_GC_M_MASK) && (uppercaseCharacter = u_toupper(baseCharacter)) != baseCharacter;
|
| + bool nextIsSmallCaps = m_font.fontDescription().variant() == FontVariantSmallCaps && !(U_GET_GC_MASK(baseCharacter) & U_GC_M_MASK) && (uppercaseCharacter = u_toupper(baseCharacter)) != baseCharacter;
|
|
|
| if (nextIsSmallCaps) {
|
| m_smallCapsBuffer[sequenceStart - cp] = uppercaseCharacter;
|
|
|