| 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 884f5a0c1d81eb7e02c13f26b3db6e5d139704d5..ee2c9e6e6239896948ab380eab2c0283635765bb 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| @@ -282,20 +282,6 @@ public:
|
| LayoutBlockFlow* nearestInnerBlockWithFirstLine();
|
|
|
| protected:
|
| - // Merge children of |siblingThatMayBeDeleted| into this object if possible, and delete
|
| - // |siblingThatMayBeDeleted|. Returns true if we were able to merge. In that case,
|
| - // |siblingThatMayBeDeleted| will be dead. We'll only be able to merge if both blocks are
|
| - // anonymous.
|
| - // TODO(mstensho): This belongs in LayoutBlockFlow, but needs to live here until we have been
|
| - // able to move all callers down to LayoutBlockFlow.
|
| - bool mergeSiblingContiguousAnonymousBlock(LayoutBlockFlow* siblingThatMayBeDeleted);
|
| -
|
| - // Reparent subsequent or preceding adjacent floating or out-of-flow siblings into this object.
|
| - // TODO(mstensho): This belongs in LayoutBlockFlow, but needs to live here until we have been
|
| - // able to move all callers down to LayoutBlockFlow first.
|
| - void reparentSubsequentFloatingOrOutOfFlowSiblings();
|
| - void reparentPrecedingFloatingOrOutOfFlowSiblings();
|
| -
|
| void willBeDestroyed() override;
|
|
|
| void dirtyForLayoutFromPercentageHeightDescendants(SubtreeLayoutScope&);
|
|
|