| Index: sky/engine/core/rendering/InlineFlowBox.cpp
|
| diff --git a/sky/engine/core/rendering/InlineFlowBox.cpp b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| index 75ecaaa194fb3ae093b58750d185eeaefff4e99f..51433d5cc8d7e1e99de6cefb769dd63895f9a753 100644
|
| --- a/sky/engine/core/rendering/InlineFlowBox.cpp
|
| +++ b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| @@ -125,7 +125,7 @@ void InlineFlowBox::addToLine(InlineBox* child)
|
| || (parentStyle->verticalAlign() != BASELINE && !isRootInlineBox()) || childStyle->verticalAlign() != BASELINE)
|
| shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
|
| }
|
| - if (childStyle->hasTextCombine() || childStyle->textEmphasisMark() != TextEmphasisMarkNone)
|
| + if (childStyle->textEmphasisMark() != TextEmphasisMarkNone)
|
| shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
|
| } else {
|
| ASSERT(isInlineFlowBox());
|
| @@ -135,7 +135,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())
|
| shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
|
| }
|
|
|
|
|