| Index: Source/core/rendering/line/LineBreaker.cpp
|
| diff --git a/Source/core/rendering/line/LineBreaker.cpp b/Source/core/rendering/line/LineBreaker.cpp
|
| index 2c8698b0e5d027cb00ff77ac9183cf5c35d1464e..b56394fcf2d5506edd1611918c71f7d6047d4799 100644
|
| --- a/Source/core/rendering/line/LineBreaker.cpp
|
| +++ b/Source/core/rendering/line/LineBreaker.cpp
|
| @@ -27,8 +27,7 @@
|
|
|
| namespace blink {
|
|
|
| -void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver,
|
| - BidiRunList<BidiRun>& bidiRuns, LineInfo& lineInfo,
|
| +void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo& lineInfo,
|
| FloatingObject* lastFloatFromPreviousLine, LineWidth& width)
|
| {
|
| while (!resolver.position().atEnd() && !requiresLineBox(resolver.position(), lineInfo, LeadingWhitespace)) {
|
| @@ -36,7 +35,7 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver,
|
| if (object->isOutOfFlowPositioned()) {
|
| setStaticPositions(m_block, toRenderBox(object));
|
| if (object->style()->isOriginalDisplayInlineType()) {
|
| - bidiRuns.addRun(createRun(0, 1, object, resolver));
|
| + resolver.runs().addRun(createRun(0, 1, object, resolver));
|
| lineInfo.incrementRunsFromLeadingWhitespace();
|
| }
|
| } else if (object->isFloating()) {
|
| @@ -48,7 +47,7 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver,
|
| }
|
| resolver.position().increment(&resolver);
|
| }
|
| - resolver.commitExplicitEmbedding(bidiRuns);
|
| + resolver.commitExplicitEmbedding(resolver.runs());
|
| }
|
|
|
| void LineBreaker::reset()
|
| @@ -58,8 +57,7 @@ void LineBreaker::reset()
|
| m_clear = CNONE;
|
| }
|
|
|
| -InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver,
|
| - BidiRunList<BidiRun>& bidiRuns, LineInfo& lineInfo,
|
| +InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo& lineInfo,
|
| RenderTextInfo& renderTextInfo, FloatingObject* lastFloatFromPreviousLine,
|
| WordMeasurements& wordMeasurements)
|
| {
|
| @@ -71,7 +69,7 @@ InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver,
|
|
|
| LineWidth width(*m_block, lineInfo.isFirstLine(), requiresIndent(lineInfo.isFirstLine(), lineInfo.previousLineBrokeCleanly(), m_block->style()));
|
|
|
| - skipLeadingWhitespace(resolver, bidiRuns, lineInfo, lastFloatFromPreviousLine, width);
|
| + skipLeadingWhitespace(resolver, lineInfo, lastFloatFromPreviousLine, width);
|
|
|
| if (resolver.position().atEnd())
|
| return resolver.position();
|
|
|