| Index: Source/core/rendering/RenderBlockFlow.h
|
| diff --git a/Source/core/rendering/RenderBlockFlow.h b/Source/core/rendering/RenderBlockFlow.h
|
| index 998b3f710f2de7eecd80343dfe9958753cbffe2c..0561c6b5985b1af24446aab13effc6a0fd780753 100644
|
| --- a/Source/core/rendering/RenderBlockFlow.h
|
| +++ b/Source/core/rendering/RenderBlockFlow.h
|
| @@ -480,12 +480,11 @@ private:
|
| void layoutRunsAndFloats(LineLayoutState&);
|
| const InlineIterator& restartLayoutRunsAndFloatsInRange(LayoutUnit oldLogicalHeight, LayoutUnit newLogicalHeight, FloatingObject* lastFloatFromPreviousLine, InlineBidiResolver&, const InlineIterator&);
|
| void layoutRunsAndFloatsInRange(LineLayoutState&, InlineBidiResolver&,
|
| - BidiRunList<BidiRun>&, const InlineIterator& cleanLineStart,
|
| - const BidiStatus& cleanLineBidiStatus);
|
| + const InlineIterator& cleanLineStart, const BidiStatus& cleanLineBidiStatus);
|
| void linkToEndLineIfNeeded(LineLayoutState&);
|
| static void repaintDirtyFloats(Vector<FloatWithRect>& floats);
|
| void checkFloatsInCleanLine(RootInlineBox*, Vector<FloatWithRect>&, size_t& floatIndex, bool& encounteredNewFloat, bool& dirtiedByFloat);
|
| - RootInlineBox* determineStartPosition(LineLayoutState&, InlineBidiResolver&, BidiRunList<BidiRun>&);
|
| + RootInlineBox* determineStartPosition(LineLayoutState&, InlineBidiResolver&);
|
| void determineEndPosition(LineLayoutState&, RootInlineBox* startBox, InlineIterator& cleanLineStart, BidiStatus& cleanLineBidiStatus);
|
| bool checkPaginationAndFloatsAtEndLine(LineLayoutState&);
|
| bool matchedEndLine(LineLayoutState&, const InlineBidiResolver&, const InlineIterator& endLineStart, const BidiStatus& endLineStatus);
|
|
|