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

third_party/WebKit/Source/core/layout/LayoutBox.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. 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
@@ skipping 4549 matching lines @@
         // Because we may have added some sections with already computed column structures, we need to
         // sync the table structure with them now. This avoids crashes when adding new cells to the table.
         toLayoutTable(box)->forceSectionsRecalc();
     } else if (box->isTableSection()) {
         toLayoutTableSection(box)->setNeedsCellRecalc();
     }
 
     box->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::AnonymousBlockChange);
 }
 
-static void collapseLoneAnonymousBlockChild(LayoutObject* child)
+static void collapseLoneAnonymousBlockChild(LayoutBox* parent, LayoutObject* child)
 {
-    ASSERT(child);
-    if (!child->isAnonymousBlock())
+    if (!child->isAnonymousBlock() || !child->isLayoutBlockFlow())
         return;
-    LayoutObject* parent = child->parent();
-    if (!parent->isLayoutBlock())
+    if (!parent->isLayoutBlockFlow())
         return;
-    LayoutBlock::collapseAnonymousBlockChild(toLayoutBlock(parent), toLayoutBlock(child));
+    toLayoutBlockFlow(parent)->collapseAnonymousBlockChild(toLayoutBlockFlow(child));
 }
 
 LayoutObject* LayoutBox::splitAnonymousBoxesAroundChild(LayoutObject* beforeChild)
 {
     LayoutBox* boxAtTopOfNewBranch = nullptr;
 
     while (beforeChild->parent() != this) {
         LayoutBox* boxToSplit = toLayoutBox(beforeChild->parent());
         if (boxToSplit->slowFirstChild() != beforeChild && boxToSplit->isAnonymous()) {
 
             // We have to split the parent box into two boxes and move children
             // from |beforeChild| to end into the new post box.
             LayoutBox* postBox = boxToSplit->createAnonymousBoxWithSameTypeAs(this);
             postBox->setChildrenInline(boxToSplit->childrenInline());
             LayoutBox* parentBox = toLayoutBox(boxToSplit->parent());
             // We need to invalidate the |parentBox| before inserting the new node
             // so that the table paint invalidation logic knows the structure is dirty.
             // See for example LayoutTableCell:localOverflowRectForPaintInvalidation.
             markBoxForRelayoutAfterSplit(parentBox);
             parentBox->virtualChildren()->insertChildNode(parentBox, postBox, boxToSplit->nextSibling());
             boxToSplit->moveChildrenTo(postBox, beforeChild, 0, true);
 
             LayoutObject* child = postBox->slowFirstChild();
             ASSERT(child);
             if (child && !child->nextSibling())
-                collapseLoneAnonymousBlockChild(child);
+                collapseLoneAnonymousBlockChild(postBox, child);
             child = boxToSplit->slowFirstChild();
             ASSERT(child);
             if (child && !child->nextSibling())
-                collapseLoneAnonymousBlockChild(child);
+                collapseLoneAnonymousBlockChild(boxToSplit, child);
 
             markBoxForRelayoutAfterSplit(boxToSplit);
             markBoxForRelayoutAfterSplit(postBox);
             boxAtTopOfNewBranch = postBox;
 
             beforeChild = postBox;
         } else {
             beforeChild = boxToSplit;
         }
     }
@@ skipping 334 matching lines @@
         m_rareData->m_snapAreas->remove(&snapArea);
     }
 }
 
 SnapAreaSet* LayoutBox::snapAreas() const
 {
     return m_rareData ? m_rareData->m_snapAreas.get() : nullptr;
 }
 
 } // namespace blink