WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/rendering/RenderTable.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 54 matching lines @@
     int outerBorderBottom() const;
     int outerBorderLeft() const;
     int outerBorderRight() const;
     
     int calcBorderLeft() const;
     int calcBorderRight() const;
     void recalcHorizontalBorders();
 
     // overrides
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
+    virtual void removeChild(RenderObject* oldChild);
+
     virtual void paint(PaintInfo&, int tx, int ty);
     virtual void paintBoxDecorations(PaintInfo&, int tx, int ty);
     virtual void paintMask(PaintInfo& paintInfo, int tx, int ty);
     virtual void layout();
     virtual void calcPrefWidths();
 
     virtual int getBaselineOfFirstLineBox() const;
 
     virtual RenderBlock* firstLineBlock() const;
     virtual void updateFirstLetter();
@@ skipping 55 matching lines @@
 
     bool needsSectionRecalc() const { return m_needsSectionRecalc; }
     void setNeedsSectionRecalc()
     {
         if (documentBeingDestroyed())
             return;
         m_needsSectionRecalc = true;
         setNeedsLayout(true);
     }
 
-    virtual RenderObject* removeChildNode(RenderObject*, bool fullRemove = true);
-
     RenderTableSection* sectionAbove(const RenderTableSection*, bool skipEmptySections = false) const;
     RenderTableSection* sectionBelow(const RenderTableSection*, bool skipEmptySections = false) const;
 
     RenderTableCell* cellAbove(const RenderTableCell*) const;
     RenderTableCell* cellBelow(const RenderTableCell*) const;
     RenderTableCell* cellBefore(const RenderTableCell*) const;
     RenderTableCell* cellAfter(const RenderTableCell*) const;
  
     const CollapsedBorderValue* currentBorderStyle() const { return m_currentBorder; }
     
@@ skipping 30 matching lines @@
     
     short m_hSpacing;
     short m_vSpacing;
     int m_borderLeft;
     int m_borderRight;
 };
 
 } // namespace WebCore
 
 #endif // RenderTable_h