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 10a6df4ca84190fa68860f875619bc80fd6a22f3..1e47e99fc4befedcf4d1d88ec2eafd630af921ff 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); } |