WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/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 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 129 matching lines @@
     }
 
     // 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();
 
     ASSERT(!beforeChild || beforeChild->isTableRow() || isTableSection && beforeChild->element() && beforeChild->element()->hasTagName(formTag) && document()->isHTMLDocument());
     RenderContainer::addChild(child, beforeChild);
 }
 
+void RenderTableSection::removeChild(RenderObject* oldChild)
+{
+    setNeedsCellRecalc();
+    RenderContainer::removeChild(oldChild);
+}
+
 bool RenderTableSection::ensureRows(int numRows)
 {
     int nRows = m_gridRows;
     if (numRows > nRows) {
         if (numRows > static_cast<int>(m_grid.size())) {
             size_t maxSize = numeric_limits<size_t>::max() / sizeof(RowStruct);
             if (static_cast<size_t>(numRows) > maxSize)
                 return false;
             m_grid.grow(numRows);
         }
@@ skipping 915 matching lines @@
         m_cCol++;
     for (int row = 0; row < m_gridRows; ++row) {
         m_grid[row].row->resize(newSize);
         Row& r = *m_grid[row].row;
         memmove(r.data() + pos + 1, r.data() + pos, (newSize - 1 - pos) * sizeof(CellStruct));
         r[pos + 1].cell = 0;
         r[pos + 1].inColSpan = r[pos].inColSpan || r[pos].cell;
     }
 }
 
-RenderObject* RenderTableSection::removeChildNode(RenderObject* child, bool fullRemove)
-{
-    setNeedsCellRecalc();
-    return RenderContainer::removeChildNode(child, fullRemove);
-}
-
 // Hit Testing
 bool RenderTableSection::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, int xPos, int yPos, int tx, int ty, HitTestAction action)
 {
     // Table sections cannot ever be hit tested.  Effectively they do not exist.
     // Just forward to our children always.
     tx += x();
     ty += y();
 
     for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
         // FIXME: We have to skip over inline flows, since they can show up inside table rows
         // at the moment (a demoted inline <form> for example). If we ever implement a
         // table-specific hit-test method (which we should do for performance reasons anyway),
         // then we can remove this check.
         if (!child->hasLayer() && !child->isRenderInline() && child->nodeAtPoint(request, result, xPos, yPos, tx, ty, action)) {
             updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
             return true;
         }
     }
     
     return false;
 }
 
 } // namespace WebCore