| Index: Source/core/layout/line/BreakingContextInlineHeaders.h
|
| diff --git a/Source/core/layout/line/BreakingContextInlineHeaders.h b/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| index d99d704563e176e0972be41d81b9628985ca9ddd..fb1e0aa5069caa95c32bfa74aaed844fc1a651a0 100644
|
| --- a/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| +++ b/Source/core/layout/line/BreakingContextInlineHeaders.h
|
| @@ -480,11 +480,6 @@ inline void BreakingContext::handleReplaced()
|
| m_renderTextInfo.m_lineBreakIterator.updatePriorContext(replacementCharacter);
|
| }
|
|
|
| -inline bool iteratorIsBeyondEndOfRenderCombineText(const InlineIterator& iter, RenderCombineText* renderer)
|
| -{
|
| - return iter.object() == renderer && iter.offset() >= renderer->textLength();
|
| -}
|
| -
|
| inline void nextCharacter(UChar& currentCharacter, UChar& lastCharacter, UChar& secondToLastCharacter)
|
| {
|
| secondToLastCharacter = lastCharacter;
|
| @@ -542,17 +537,6 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
|
| m_lineBreak.moveToStartOf(m_current.object());
|
| }
|
|
|
| - if (renderText->style()->hasTextCombine() && m_current.object()->isCombineText() && !toRenderCombineText(m_current.object())->isCombined()) {
|
| - RenderCombineText* combineRenderer = toRenderCombineText(m_current.object());
|
| - combineRenderer->combineText();
|
| - // The length of the renderer's text may have changed. Increment stale iterator positions
|
| - if (iteratorIsBeyondEndOfRenderCombineText(m_lineBreak, combineRenderer)) {
|
| - ASSERT(iteratorIsBeyondEndOfRenderCombineText(m_resolver.position(), combineRenderer));
|
| - m_lineBreak.increment();
|
| - m_resolver.position().increment(&m_resolver);
|
| - }
|
| - }
|
| -
|
| RenderStyle* style = renderText->style(m_lineInfo.isFirstLine());
|
| const Font& font = style->font();
|
| bool isFixedPitch = font.isFixedPitch();
|
|
|