Commit 3c1544fd authored by hyatt's avatar hyatt

Fix crazyapplerumors.com. I had the logic backwards. CSS

	padding beats cellpadding.

        * khtml/rendering/render_table.cpp:
        (RenderTableCell::paddingTop):
        (RenderTableCell::paddingBottom):
        (RenderTableCell::paddingLeft):
        (RenderTableCell::paddingRight):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2746 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a1993bd6
2002-11-18 David Hyatt <hyatt@apple.com>
Fix crazyapplerumors.com. I had the logic backwards. CSS
padding beats cellpadding.
* khtml/rendering/render_table.cpp:
(RenderTableCell::paddingTop):
(RenderTableCell::paddingBottom):
(RenderTableCell::paddingLeft):
(RenderTableCell::paddingRight):
2002-11-18 David Hyatt <hyatt@apple.com>
Fix crash on espn.com.
......
2002-11-18 David Hyatt <hyatt@apple.com>
Fix crazyapplerumors.com. I had the logic backwards. CSS
padding beats cellpadding.
* khtml/rendering/render_table.cpp:
(RenderTableCell::paddingTop):
(RenderTableCell::paddingBottom):
(RenderTableCell::paddingLeft):
(RenderTableCell::paddingRight):
2002-11-18 David Hyatt <hyatt@apple.com>
Fix crash on espn.com.
......
2002-11-18 David Hyatt <hyatt@apple.com>
Fix crazyapplerumors.com. I had the logic backwards. CSS
padding beats cellpadding.
* khtml/rendering/render_table.cpp:
(RenderTableCell::paddingTop):
(RenderTableCell::paddingBottom):
(RenderTableCell::paddingLeft):
(RenderTableCell::paddingRight):
2002-11-18 David Hyatt <hyatt@apple.com>
Fix crash on espn.com.
......
......@@ -2141,30 +2141,38 @@ void RenderTableCell::close()
int RenderTableCell::paddingTop() const
{
if (style()->hasPadding())
return RenderFlow::paddingTop();
if (m_table && m_table->cellPadding() != -1)
return m_table->cellPadding();
return RenderFlow::paddingTop();
return 0;
}
int RenderTableCell::paddingBottom() const
{
if (style()->hasPadding())
return RenderFlow::paddingBottom();
if (m_table && m_table->cellPadding() != -1)
return m_table->cellPadding();
return RenderFlow::paddingBottom();
return 0;
}
int RenderTableCell::paddingLeft() const
{
if (style()->hasPadding())
return RenderFlow::paddingLeft();
if (m_table && m_table->cellPadding() != -1)
return m_table->cellPadding();
return RenderFlow::paddingLeft();
return 0;
}
int RenderTableCell::paddingRight() const
{
if (style()->hasPadding())
return RenderFlow::paddingRight();
if (m_table && m_table->cellPadding() != -1)
return m_table->cellPadding();
return RenderFlow::paddingRight();
return 0;
}
void RenderTableCell::repaintRectangle(int x, int y, int w, int h, bool immediate, bool f)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment