| Index: third_party/WebKit/Source/core/layout/line/LineBreaker.h
|
| diff --git a/third_party/WebKit/Source/core/layout/line/LineBreaker.h b/third_party/WebKit/Source/core/layout/line/LineBreaker.h
|
| index 7529db93f1f42516dce8552246b0ab0bd364a67f..4d7c9c7f8d3691daa198d94d685323cd36abef80 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/LineBreaker.h
|
| +++ b/third_party/WebKit/Source/core/layout/line/LineBreaker.h
|
| @@ -45,8 +45,7 @@ public:
|
| reset();
|
| }
|
|
|
| - InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, LayoutTextInfo&,
|
| - FloatingObject* lastFloatFromPreviousLine, WordMeasurements&);
|
| + InlineIterator nextLineBreak(InlineBidiResolver&, LineInfo&, LayoutTextInfo&, WordMeasurements&);
|
|
|
| bool lineWasHyphenated() { return m_hyphenated; }
|
| const Vector<LineLayoutBox>& positionedObjects() { return m_positionedObjects; }
|
| @@ -54,7 +53,7 @@ public:
|
| private:
|
| void reset();
|
|
|
| - void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, FloatingObject* lastFloatFromPreviousLine, LineWidth&);
|
| + void skipLeadingWhitespace(InlineBidiResolver&, LineInfo&, LineWidth&);
|
|
|
| LineLayoutBlockFlow m_block;
|
| bool m_hyphenated;
|
|
|