| Index: third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.h b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| index 1692b5a8467baf9894211e1166dd21328b425ea7..a076d9a33c64d4ab31dfa0a8bdb190e1f5ee4eff 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| @@ -387,7 +387,6 @@ private:
|
|
|
| virtual void removeLeftoverAnonymousBlock(LayoutBlock* child);
|
|
|
| - static void collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child);
|
| void makeChildrenInlineIfPossible();
|
|
|
| void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dirtyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); }
|
| @@ -455,6 +454,7 @@ public:
|
| // return the distance to the next fragmentainer that can fit this piece of content.
|
| LayoutUnit calculatePaginationStrutToFitContent(LayoutUnit offset, LayoutUnit strutToNextPage, LayoutUnit contentLogicalHeight) const;
|
|
|
| + static void collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child);
|
| protected:
|
| bool isPageLogicalHeightKnown(LayoutUnit logicalOffset) const { return pageLogicalHeightForOffset(logicalOffset); }
|
|
|
|
|