Move collapseAnonymousBlockChild() to LayoutBlockFlow, and make it non-static.

third_party/WebKit/Source/core/layout/LayoutBlock.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 410 matching lines @@
     LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr) final;
     bool isInlineBoxWrapperActuallyChild() const;
 
     Position positionForBox(InlineBox*, bool start = true) const;
 
     // End helper functions and structs used by layoutBlockChildren.
 
     void removeFromGlobalMaps();
     bool widthAvailableToChildrenHasChanged();
 
-public:
-    static void collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child);
 protected:
     bool isPageLogicalHeightKnown(LayoutUnit logicalOffset) const { return pageLogicalHeightForOffset(logicalOffset); }
 
     // Returns the logical offset at the top of the next page, for a given offset.
     //
     // If the given offset is at a page boundary, using AssociateWithLatterPage as PageBoundaryRule
     // will move us one page ahead (since the offset is at the top of the "current" page). Using
     // AssociateWithFormerPage instead will keep us where we are (since the offset is at the bottom
     // of the "current" page, which is exactly the same offset as the top offset on the next page).
     //
     // For a page height of 800px, AssociateWithLatterPage will return 1600 if the value passed in
     // is 800. AssociateWithFormerPage will simply return 800.
     LayoutUnit nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundaryRule) const;
 
     // Paginated content inside this block was laid out.
     // |logicalBottomOffsetAfterPagination| is the logical bottom offset of the child content after
     // applying any forced or unforced breaks as needed.
     void paginatedContentWasLaidOut(LayoutUnit logicalBottomOffsetAfterPagination);
 
     // Adjust from painting offsets to the local coords of this layoutObject
     void offsetForContents(LayoutPoint&) const;
 
     PositionWithAffinity positionForPointRespectingEditingBoundaries(LineLayoutBox child, const LayoutPoint& pointInParentCoordinates);
     PositionWithAffinity positionForPointIfOutsideAtomicInlineLevel(const LayoutPoint&);
 
     virtual bool updateLogicalWidthAndColumnWidth();
 
-    virtual bool canCollapseAnonymousBlockChild() const { return true; }
-
     LayoutObjectChildList m_children;
     LineBoxList m_lineBoxes; // All of the root line boxes created for this block flow.  For example, <div>Hello<br>world.</div> will have two total lines for the <div>.
 
     unsigned m_hasMarginBeforeQuirk : 1; // Note these quirk values can't be put in LayoutBlockRareData since they are set too frequently.
     unsigned m_hasMarginAfterQuirk : 1;
     unsigned m_beingDestroyed : 1;
     unsigned m_hasMarkupTruncation : 1;
     unsigned m_widthAvailableToChildrenChanged  : 1;
     unsigned m_heightAvailableToChildrenChanged  : 1;
     unsigned m_isSelfCollapsing : 1; // True if margin-before and margin-after are adjoining.
     unsigned m_descendantsWithFloatsMarkedForLayout : 1;
 
     unsigned m_hasPositionedObjects : 1;
     unsigned m_hasPercentHeightDescendants : 1;
 
     // LayoutRubyBase objects need to be able to split and merge, moving their children around
     // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline).
     friend class LayoutRubyBase;
 
     // FIXME: This is temporary as we move code that accesses block flow
     // member variables out of LayoutBlock and into LayoutBlockFlow.
     friend class LayoutBlockFlow;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBlock, isLayoutBlock());
 
 } // namespace blink
 
 #endif // LayoutBlock_h