Merge 113581

Source/WebCore/rendering/RenderTableSection.cpp

 /*
  * Copyright (C) 1997 Martin Jones (mjones@kde.org)
  *           (C) 1997 Torben Weis (weis@kde.org)
  *           (C) 1998 Waldo Bastian (bastian@kde.org)
  *           (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 163 matching lines @@
     ++m_cRow;
     m_cCol = 0;
 
     ensureRows(m_cRow);
 
     m_grid[insertionRow].rowRenderer = toRenderTableRow(child);
 
     if (!beforeChild)
         setRowLogicalHeightToRowStyleLogicalHeightIfNotRelative(m_grid[insertionRow]);
 
-    // If the next renderer is actually wrapped in an anonymous table row, we need to go up and find that.
-    while (beforeChild && beforeChild->parent() != this)
-        beforeChild = beforeChild->parent();
+    if (beforeChild && beforeChild->parent() != this)
+        beforeChild = splitAnonymousBoxesAroundChild(beforeChild);
 
     ASSERT(!beforeChild || beforeChild->isTableRow());
     RenderBox::addChild(child, beforeChild);
     toRenderTableRow(child)->updateBeforeAndAfterContent();
 }
 
 void RenderTableSection::removeChild(RenderObject* oldChild)
 {
     setNeedsCellRecalc();
     RenderBox::removeChild(oldChild);
@@ skipping 1220 matching lines @@
 {
     RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(parent->style());
     newStyle->setDisplay(TABLE_ROW_GROUP);
 
     RenderTableSection* newSection = new (parent->renderArena()) RenderTableSection(parent->document() /* is anonymous */);
     newSection->setStyle(newStyle.release());
     return newSection;
 }
 
 } // namespace WebCore