| Index: Source/core/layout/line/InlineFlowBox.cpp
|
| diff --git a/Source/core/layout/line/InlineFlowBox.cpp b/Source/core/layout/line/InlineFlowBox.cpp
|
| index f81ae36630fef868145a7073fa9c1be0f8911085..ff70adea56b1afdfa8f92c0911fab7e96c51fd6c 100644
|
| --- a/Source/core/layout/line/InlineFlowBox.cpp
|
| +++ b/Source/core/layout/line/InlineFlowBox.cpp
|
| @@ -131,7 +131,7 @@ void InlineFlowBox::addToLine(InlineBox* child)
|
| || (parentStyle.verticalAlign() != BASELINE && !isRootInlineBox()) || childStyle.verticalAlign() != BASELINE)
|
| shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
|
| }
|
| - if (childStyle.hasTextCombine() || childStyle.textEmphasisMark() != TextEmphasisMarkNone)
|
| + if (child->layoutObject().isCombineText() || childStyle.textEmphasisMark() != TextEmphasisMarkNone)
|
| shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
|
| } else {
|
| if (child->layoutObject().isBR()) {
|
| @@ -146,7 +146,7 @@ void InlineFlowBox::addToLine(InlineBox* child)
|
| || !parentStyle.font().fontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle.font().fontMetrics())
|
| || parentStyle.lineHeight() != childStyle.lineHeight()
|
| || (parentStyle.verticalAlign() != BASELINE && !isRootInlineBox()) || childStyle.verticalAlign() != BASELINE
|
| - || childStyle.hasBorder() || childStyle.hasPadding() || childStyle.hasTextCombine())
|
| + || childStyle.hasBorder() || childStyle.hasPadding() || child->layoutObject().isCombineText())
|
| shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
|
| }
|
| }
|
|
|