| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index 5a83a7715c369eed18e61eab9e3b5124511a1658..ca4ff243d42e22c68bf317cdc7e13bfd3d943e77 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -330,9 +330,6 @@ void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldSty
|
| {
|
| RenderBox::styleDidChange(diff, oldStyle);
|
|
|
| - if (isFloatingOrOutOfFlowPositioned() && oldStyle && !oldStyle->isFloating() && !oldStyle->hasOutOfFlowPosition() && parent() && parent()->isRenderBlockFlow())
|
| - toRenderBlock(parent())->removeAnonymousWrappersIfRequired();
|
| -
|
| RenderStyle* newStyle = style();
|
|
|
| if (!isAnonymousBlock()) {
|
| @@ -1087,25 +1084,6 @@ static bool canMergeContiguousAnonymousBlocks(RenderObject* oldChild, RenderObje
|
| && prev->isAnonymousColumnSpanBlock() == next->isAnonymousColumnSpanBlock();
|
| }
|
|
|
| -void RenderBlock::removeAnonymousWrappersIfRequired()
|
| -{
|
| - ASSERT(isRenderBlockFlow());
|
| - Vector<RenderBox*, 16> blocksToRemove;
|
| - for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
|
| - // There are still block children in the container, so any anonymous wrappers are still needed.
|
| - if (!child->isAnonymousBlock() && !child->isFloatingOrOutOfFlowPositioned())
|
| - return;
|
| - // We can't remove anonymous wrappers if they contain continuations as this means there are block children present.
|
| - if (child->isRenderBlock() && toRenderBlock(child)->continuation())
|
| - return;
|
| - if (child->isAnonymousBlock())
|
| - blocksToRemove.append(child);
|
| - }
|
| -
|
| - for (size_t i = 0; i < blocksToRemove.size(); i++)
|
| - collapseAnonymousBlockChild(this, toRenderBlock(blocksToRemove[i]));
|
| -}
|
| -
|
| void RenderBlock::collapseAnonymousBlockChild(RenderBlock* parent, RenderBlock* child)
|
| {
|
| // It's possible that this block's destruction may have been triggered by the
|
|
|