| Index: Source/core/layout/line/BreakingContextInlineHeaders.h
|
| diff --git a/Source/core/layout/line/BreakingContextInlineHeaders.h b/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| index e9f85ff4dec837d772ce4ec8f605ec029fe2ffe4..704ea7660a4810e8921d51f437e1978e6c2e3295 100644
|
| --- a/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| +++ b/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| @@ -511,7 +511,7 @@ ALWAYS_INLINE TextDirection textDirectionFromUnicode(WTF::Unicode::Direction dir
|
| ALWAYS_INLINE float textWidth(LayoutText* text, unsigned from, unsigned len, const Font& font, float xPos, bool collapseWhiteSpace, HashSet<const SimpleFontData*>* fallbackFonts = 0)
|
| {
|
| GlyphOverflow glyphOverflow;
|
| - if ((!from && len == text->textLength()) || text->style()->hasTextCombine())
|
| + if ((!from && len == text->textLength()) || text->isCombineText())
|
| return text->width(from, len, font, xPos, text->style()->direction(), fallbackFonts, &glyphOverflow);
|
|
|
| TextRun run = constructTextRun(text, font, text, from, len, text->styleRef());
|
| @@ -553,7 +553,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
|
| bool midWordBreak = false;
|
| bool breakAll = m_currentStyle->wordBreak() == BreakAllWordBreak && m_autoWrap;
|
| bool keepAll = m_currentStyle->wordBreak() == KeepAllWordBreak && m_autoWrap;
|
| - bool prohibitBreakInside = m_currentStyle->hasTextCombine() && layoutText->isCombineText() && toLayoutTextCombine(layoutText)->isCombined();
|
| + bool prohibitBreakInside = layoutText->isCombineText() && toLayoutTextCombine(layoutText)->isCombined();
|
| float hyphenWidth = 0;
|
|
|
| if (isSVGText) {
|
|
|