Rubberstamped by Maciej.

[WebKit-https.git] / WebCore / rendering / RenderTableCell.h

diff --git a/WebCore/rendering/RenderTableCell.h b/WebCore/rendering/RenderTableCell.h
index 08a87f6..60a501a 100644 (file)
--- a/WebCore/rendering/RenderTableCell.h
+++ b/WebCore/rendering/RenderTableCell.h
@@ -64,6 +64,8 @@ public:
     virtual void setWidth(int);
     virtual void setStyle(RenderStyle*);
 
     virtual void setWidth(int);
     virtual void setStyle(RenderStyle*);
 

+    virtual bool expandsToEncloseOverhangingFloats() const { return true; }
+

     int borderLeft() const;
     int borderRight() const;
     int borderTop() const;
     int borderLeft() const;
     int borderRight() const;
     int borderTop() const;


@@ -82,9 +84,9 @@ public:
     void setCellTopExtra(int p) { _topExtra = p; }
     void setCellBottomExtra(int p) { _bottomExtra = p; }
 
     void setCellTopExtra(int p) { _topExtra = p; }
     void setCellBottomExtra(int p) { _bottomExtra = p; }
 

-    virtual void paint(PaintInfo& i, int tx, int ty);
+    virtual void paint(PaintInfo&, int tx, int ty);

 
 

-    void paintCollapsedBorder(GraphicsContext* p, int x, int y, int w, int h);
+    void paintCollapsedBorder(GraphicsContext*, int x, int y, int w, int h);

     
     // lie about position to outside observers
     virtual int yPos() const { return m_y + _topExtra; }
     
     // lie about position to outside observers
     virtual int yPos() const { return m_y + _topExtra; }


@@ -100,8 +102,8 @@ public:
     RenderTable* table() const { return static_cast<RenderTable*>(parent()->parent()->parent()); }
     RenderTableSection* section() const { return static_cast<RenderTableSection*>(parent()->parent()); }
 
     RenderTable* table() const { return static_cast<RenderTable*>(parent()->parent()->parent()); }
     RenderTableSection* section() const { return static_cast<RenderTableSection*>(parent()->parent()); }
 

-#if !NDEBUG
-    virtual void dump(QTextStream *stream, DeprecatedString ind = "") const;
+#ifndef NDEBUG
+    virtual void dump(TextStream *stream, DeprecatedString ind = "") const;

 #endif
 
     void paintBackgroundsBehindCell(PaintInfo&, int tx, int ty, RenderObject* backgroundObject);
 #endif
 
     void paintBackgroundsBehindCell(PaintInfo&, int tx, int ty, RenderObject* backgroundObject);


@@ -114,10 +116,9 @@ protected:
     int rSpan;
     int cSpan;
     int _topExtra : 31;
     int rSpan;
     int cSpan;
     int _topExtra : 31;

-    bool nWrap : 1;

     int _bottomExtra : 31;
     bool m_widthChanged : 1;
     int _bottomExtra : 31;
     bool m_widthChanged : 1;

-    
+

     int m_percentageHeight;
 };
 
     int m_percentageHeight;
 };