Move some reparenting and anonymous block merge functionality down to LayoutBlockFlow.

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

 /*
  * 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, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
@@ skipping 231 matching lines @@
             || oldStyle.paddingLeft() != newStyle.paddingLeft()
             || oldStyle.paddingRight() != newStyle.paddingRight();
     }
 
     return oldStyle.borderTopWidth() != newStyle.borderTopWidth()
         || oldStyle.borderBottomWidth() != newStyle.borderBottomWidth()
         || oldStyle.paddingTop() != newStyle.paddingTop()
         || oldStyle.paddingBottom() != newStyle.paddingBottom();
 }
 
-static bool isMergeableAnonymousBlock(const LayoutBlockFlow* block)
-{
-    return block->isAnonymousBlock() && !block->continuation() && !block->beingDestroyed() && !block->isRubyRun() && !block->isRubyBase();
-}
-
-bool LayoutBlock::mergeSiblingContiguousAnonymousBlock(LayoutBlockFlow* siblingThatMayBeDeleted)
-{
-    if (!isLayoutBlockFlow())
-        return false;
-
-    // Note: |this| and |siblingThatMayBeDeleted| may not be adjacent siblings at this point. There
-    // may be an object between them which is about to be removed.
-
-    if (!isMergeableAnonymousBlock(toLayoutBlockFlow(this)) || !isMergeableAnonymousBlock(siblingThatMayBeDeleted))
-        return false;
-
-    setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::AnonymousBlockChange);
-
-    // If the inlineness of children of the two block don't match, we'd need special code here
-    // (but there should be no need for it).
-    ASSERT(siblingThatMayBeDeleted->childrenInline() == childrenInline());
-    // Take all the children out of the |next| block and put them in
-    // the |prev| block.
-    siblingThatMayBeDeleted->moveAllChildrenIncludingFloatsTo(this, siblingThatMayBeDeleted->hasLayer() || hasLayer());
-    // Delete the now-empty block's lines and nuke it.
-    siblingThatMayBeDeleted->deleteLineBoxTree();
-    siblingThatMayBeDeleted->destroy();
-    return true;
-}
-
-void LayoutBlock::reparentSubsequentFloatingOrOutOfFlowSiblings()
-{
-    if (!parent() || !parent()->isLayoutBlockFlow())
-        return;
-    if (beingDestroyed() || documentBeingDestroyed())
-        return;
-    LayoutBlockFlow* parentBlockFlow = toLayoutBlockFlow(parent());
-    LayoutObject* child = nextSibling();
-    while (child && child->isFloatingOrOutOfFlowPositioned()) {
-        LayoutObject* sibling = child->nextSibling();
-        parentBlockFlow->moveChildTo(this, child, nullptr, false);
-        child = sibling;
-    }
-
-    if (LayoutObject* next = nextSibling()) {
-        if (next->isLayoutBlockFlow())
-            mergeSiblingContiguousAnonymousBlock(toLayoutBlockFlow(next));
-    }
-}
-
-void LayoutBlock::reparentPrecedingFloatingOrOutOfFlowSiblings()
-{
-    if (!parent() || !parent()->isLayoutBlockFlow())
-        return;
-    if (beingDestroyed() || documentBeingDestroyed())
-        return;
-    LayoutBlockFlow* parentBlockFlow = toLayoutBlockFlow(parent());
-    LayoutObject* child = previousSibling();
-    while (child && child->isFloatingOrOutOfFlowPositioned()) {
-        LayoutObject* sibling = child->previousSibling();
-        parentBlockFlow->moveChildTo(this, child, firstChild(), false);
-        child = sibling;
-    }
-}
-
 void LayoutBlock::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
     LayoutBox::styleDidChange(diff, oldStyle);
 
     const ComputedStyle& newStyle = styleRef();
 
     if (oldStyle && parent()) {
         if (oldStyle->position() != newStyle.position() && newStyle.position() != StaticPosition) {
             // Remove our absolute and fixed positioned descendants from their new containing block,
             // in case containingBlock() changes by the change to the position property.
@@ skipping 1861 matching lines @@
         for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescendantSet->begin(); it != end; ++it) {
             LayoutBox* currBox = *it;
             ASSERT(!currBox->needsLayout());
         }
     }
 }
 
 #endif
 
 } // namespace blink