Index: third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h |
diff --git a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h |
index 97343250d6842e431f323eb97df75c66c917df76..2c6b2da41bd301e4ff35120e7c491be6e60cdb7b 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h |
+++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.h |
@@ -38,13 +38,13 @@ class CORE_EXPORT NGLineBreaker { |
// TODO(kojii): NGInlineLayoutAlgorithm is needed because floats require |
// not only constraint space but also container builder. Consider refactor |
// not to require algorithm. |
- void NextLine(NGInlineItemResults*, NGInlineLayoutAlgorithm*); |
+ bool NextLine(NGLineInfo*, NGInlineLayoutAlgorithm*); |
// Create an NGInlineBreakToken for the last line returned by NextLine(). |
RefPtr<NGInlineBreakToken> CreateBreakToken() const; |
private: |
- void BreakLine(NGInlineItemResults*, NGInlineLayoutAlgorithm*); |
+ void BreakLine(NGLineInfo*, NGInlineLayoutAlgorithm*); |
enum class LineBreakState { |
// The current position is not breakable. |
@@ -71,8 +71,8 @@ class CORE_EXPORT NGLineBreaker { |
void HandleOpenTag(const NGInlineItem&, NGInlineItemResult*); |
void HandleCloseTag(const NGInlineItem&, NGInlineItemResult*); |
- void HandleOverflow(NGInlineItemResults*); |
- void Rewind(NGInlineItemResults*, unsigned new_end); |
+ void HandleOverflow(NGLineInfo*); |
+ void Rewind(NGLineInfo*, unsigned new_end); |
void UpdateBreakIterator(const ComputedStyle&); |