| Index: Source/core/layout/line/LineBreaker.cpp
|
| diff --git a/Source/core/layout/line/LineBreaker.cpp b/Source/core/layout/line/LineBreaker.cpp
|
| index 4d4d316509ac0da65d42bb0805d3a92475a4f88f..c4f31d29073ba1a456153485d04b1063af75685c 100644
|
| --- a/Source/core/layout/line/LineBreaker.cpp
|
| +++ b/Source/core/layout/line/LineBreaker.cpp
|
| @@ -35,11 +35,11 @@ void LineBreaker::skipLeadingWhitespace(InlineBidiResolver& resolver, LineInfo&
|
| if (object->isOutOfFlowPositioned()) {
|
| setStaticPositions(m_block, toLayoutBox(object));
|
| if (object->style()->isOriginalDisplayInlineType()) {
|
| - resolver.runs().addRun(createRun(0, 1, object, resolver));
|
| + resolver.runs().addRun(createRun(0, 1, LineLayoutItem(object), resolver));
|
| lineInfo.incrementRunsFromLeadingWhitespace();
|
| }
|
| } else if (object->isFloating()) {
|
| - m_block->positionNewFloatOnLine(*m_block->insertFloatingObject(*toLayoutBox(object)), lastFloatFromPreviousLine, lineInfo, width);
|
| + m_block.positionNewFloatOnLine(*m_block.insertFloatingObject(*toLayoutBox(object)), lastFloatFromPreviousLine, lineInfo, width);
|
| }
|
| resolver.position().increment(&resolver);
|
| }
|
| @@ -63,7 +63,7 @@ InlineIterator LineBreaker::nextLineBreak(InlineBidiResolver& resolver, LineInfo
|
|
|
| bool appliedStartWidth = resolver.position().offset() > 0;
|
|
|
| - LineWidth width(*m_block, lineInfo.isFirstLine(), requiresIndent(lineInfo.isFirstLine(), lineInfo.previousLineBrokeCleanly(), m_block->styleRef()));
|
| + LineWidth width(m_block, lineInfo.isFirstLine(), requiresIndent(lineInfo.isFirstLine(), lineInfo.previousLineBrokeCleanly(), m_block.styleRef()));
|
|
|
| skipLeadingWhitespace(resolver, lineInfo, lastFloatFromPreviousLine, width);
|
|
|
|
|