Move makeChildrenInlineIfPossible 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 472 matching lines @@
     if (child->parent()->isLayoutGrid())
         toLayoutGrid(child->parent())->dirtyGrid();
 
     // Now remove the leftover anonymous block from the tree, and destroy it. We'll rip it out
     // manually from the tree before destroying it, because we don't want to trigger any tree
     // adjustments with regards to anonymous blocks (or any other kind of undesired chain-reaction).
     children()->removeChildNode(this, child, false);
     child->destroy();
 }
 
-void LayoutBlock::makeChildrenInlineIfPossible()
-{
-    ASSERT(isLayoutBlockFlow());
-    // Collapsing away anonymous wrappers isn't relevant for the children of anonymous blocks, unless they are ruby bases.
-    if (isAnonymousBlock() && !isRubyBase())
-        return;
-
-    Vector<LayoutBlock*, 3> blocksToRemove;
-    for (LayoutObject* child = firstChild(); child; child = child->nextSibling()) {
-        if (child->isFloating())
-            continue;
-        if (child->isOutOfFlowPositioned())
-            continue;
-
-        // There are still block children in the container, so any anonymous wrappers are still needed.
-        if (!child->isAnonymousBlock())
-            return;
-        // If one of the children is being destroyed then it is unsafe to clean up anonymous wrappers as the
-        // entire branch may be being destroyed.
-        if (toLayoutBlock(child)->beingDestroyed())
-            return;
-        // We can't remove anonymous wrappers if they contain continuations as this means there are block children present.
-        if (toLayoutBlock(child)->continuation())
-            return;
-        // We are only interested in removing anonymous wrappers if there are inline siblings underneath them.
-        if (!child->childrenInline())
-            return;
-        // Ruby elements use anonymous wrappers for ruby runs and ruby bases by design, so we don't remove them.
-        if (child->isRubyRun() || child->isRubyBase())
-            return;
-
-        blocksToRemove.append(toLayoutBlock(child));
-    }
-
-    // If we make an object's children inline we are going to frustrate any future attempts to remove
-    // floats from its children's float-lists before the next layout happens so clear down all the floatlists
-    // now - they will be rebuilt at layout.
-    toLayoutBlockFlow(this)->removeFloatingObjectsFromDescendants();
-
-    for (size_t i = 0; i < blocksToRemove.size(); i++)
-        collapseAnonymousBlockChild(this, blocksToRemove[i]);
-    setChildrenInline(true);
-}
-
 void LayoutBlock::collapseAnonymousBlockChild(LayoutBlock* parent, LayoutBlock* child)
 {
     if (!parent->canCollapseAnonymousBlockChild())
         return;
     // It's possible that this block's destruction may have been triggered by the
     // child's removal. Just bail if the anonymous child block is already being
     // destroyed. See crbug.com/282088
     if (child->beingDestroyed())
         return;
     if (child->continuation())
@@ skipping 1576 matching lines @@
         for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescendantSet->begin(); it != end; ++it) {
             LayoutBox* currBox = *it;
             ASSERT(!currBox->needsLayout());
         }
     }
 }
 
 #endif
 
 } // namespace blink