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 f4af3baec2c01ecd349be6a74f379f56a1af6294..af819bf8a6349fc04000ec7f4be22797fd2e3692 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlock.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h |
@@ -390,7 +390,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)); } |
@@ -458,6 +457,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); } |