Index: Source/WebCore/rendering/RenderBlockLineLayout.cpp |
=================================================================== |
--- Source/WebCore/rendering/RenderBlockLineLayout.cpp (revision 105777) |
+++ Source/WebCore/rendering/RenderBlockLineLayout.cpp (working copy) |
@@ -1889,9 +1889,10 @@ |
} |
} else if (object->isFloating()) |
m_block->positionNewFloatOnLine(m_block->insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width); |
- else if (object->isText() && object->style()->hasTextCombine() && object->isCombineText()) { |
+ else if (object->isText() && object->style()->hasTextCombine() && object->isCombineText() && !toRenderCombineText(object)->isCombined()) { |
toRenderCombineText(object)->combineText(); |
- continue; |
+ if (toRenderCombineText(object)->isCombined()) |
+ continue; |
} |
resolver.increment(); |
} |