WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/rendering/RenderTable.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, 2007, 2008 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 183 matching lines @@
         beforeChild = 0;
     RenderTableSection* section = new (renderArena()) RenderTableSection(document() /* anonymous */);
     RefPtr<RenderStyle> newStyle = RenderStyle::create();
     newStyle->inheritFrom(style());
     newStyle->setDisplay(TABLE_ROW_GROUP);
     section->setStyle(newStyle.release());
     addChild(section, beforeChild);
     section->addChild(child);
 }
 
+void RenderTable::removeChild(RenderObject* oldChild)
+{
+    RenderContainer::removeChild(oldChild);
+    setNeedsSectionRecalc();
+}
+
 void RenderTable::calcWidth()
 {
     if (isPositioned())
         calcAbsoluteHorizontal();
 
     RenderBlock* cb = containingBlock();
     int availableWidth = cb->availableWidth();
 
     LengthType widthType = style()->width().type();
     if (widthType > Relative && style()->width().isPositive()) {
@@ skipping 489 matching lines @@
     }
     
     m_columns.resize(maxCols);
     m_columnPos.resize(maxCols + 1);
 
     ASSERT(selfNeedsLayout());
 
     m_needsSectionRecalc = false;
 }
 
-RenderObject* RenderTable::removeChildNode(RenderObject* child, bool fullRemove)
-{
-    setNeedsSectionRecalc();
-    return RenderContainer::removeChildNode(child, fullRemove);
-}
-
 int RenderTable::calcBorderLeft() const
 {
     if (collapseBorders()) {
         // Determined by the first cell of the first row. See the CSS 2.1 spec, section 17.6.2.
         if (!numEffCols())
             return 0;
 
         unsigned borderWidth = 0;
 
         const BorderValue& tb = style()->borderLeft();
@@ skipping 400 matching lines @@
     // we might have to hack this code first (depending on what order we do these bug fixes in).
     if (m_caption) {
         rect.setHeight(height());
         rect.setY(ty);
     }
 
     return rect;
 }
 
 }