WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/rendering/RenderTableSection.h

 /*
  * This file is part of the DOM implementation for KDE.
  *
  * 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 Apple Computer, Inc.
  *
@@ skipping 31 matching lines @@
 
     virtual const char* renderName() const { return isAnonymous() ? "RenderTableSection (anonymous)" : "RenderTableSection"; }
 
     virtual bool isTableSection() const { return true; }
 
     virtual void destroy();
 
     virtual void layout();
 
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
+    virtual void removeChild(RenderObject* oldChild);
 
     virtual int getBaselineOfFirstLineBox() const;
 
     void addCell(RenderTableCell*, RenderTableRow* row);
 
     void setCellWidths();
     int calcRowHeight();
     int layoutRows(int height);
 
     RenderTable* table() const { return static_cast<RenderTable*>(parent()); }
@@ skipping 52 matching lines @@
 
     bool needsCellRecalc() const { return m_needsCellRecalc; }
     void setNeedsCellRecalc()
     {
         m_needsCellRecalc = true;
         table()->setNeedsSectionRecalc();
     }
 
     int getBaseline(int row) { return m_grid[row].baseline; }
 
-    virtual RenderObject* removeChildNode(RenderObject*, bool fullRemove = true);
-
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
 
 private:
     virtual int lineHeight(bool, bool) const { return 0; }
     virtual void position(InlineBox*) { }
 
     bool ensureRows(int);
     void clearGrid();
 
     Vector<RowStruct> m_grid;
@@ skipping 12 matching lines @@
     int m_overflowLeft;
     int m_overflowWidth;
     int m_overflowTop;
     int m_overflowHeight;
     bool m_hasOverflowingCell;
 };
 
 } // namespace WebCore
 
 #endif // RenderTableSection_h