Commit b1bda391 authored by hyatt's avatar hyatt

Fix asserts in tables.

        * khtml/rendering/render_table.cpp:
        (RenderTableRow::layout):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2703 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 922ba374
2002-11-15 David Hyatt <hyatt@apple.com>
Fix asserts in tables.
* khtml/rendering/render_table.cpp:
(RenderTableRow::layout):
2002-11-15 David Hyatt <hyatt@apple.com>
Fix for whitespace regressions that caused text overlapping
......
2002-11-15 David Hyatt <hyatt@apple.com>
Fix asserts in tables.
* khtml/rendering/render_table.cpp:
(RenderTableRow::layout):
2002-11-15 David Hyatt <hyatt@apple.com>
Fix for whitespace regressions that caused text overlapping
......
2002-11-15 David Hyatt <hyatt@apple.com>
Fix asserts in tables.
* khtml/rendering/render_table.cpp:
(RenderTableRow::layout):
2002-11-15 David Hyatt <hyatt@apple.com>
Fix for whitespace regressions that caused text overlapping
......
......@@ -1262,15 +1262,15 @@ static inline RenderObject *next(RenderObject *par, RenderObject *current)
while(current != 0)
{
//kdDebug( 6040 ) << "current = " << current << endl;
if(!current->isFloating() && !current->isReplaced() && !current->isPositioned())
next = current->firstChild();
if(!next) {
while(current && current != par) {
next = current->nextSibling();
if(next) break;
current = current->parent();
}
}
if(!current->isFloating() && !current->isReplaced() && !current->isPositioned())
next = current->firstChild();
if(!next) {
while(current && current != par) {
next = current->nextSibling();
if(next) break;
current = current->parent();
}
}
if(!next) break;
......@@ -1289,7 +1289,6 @@ void RenderFlow::calcInlineMinMaxWidth()
int cw = containingBlock()->contentWidth();
RenderObject *child = firstChild();
RenderObject *prevchild = 0;
// If we are at the start of a line, we want to ignore all white-space.
// Also strip spaces if we previously had text that ended in a trailing space.
......@@ -1480,7 +1479,6 @@ void RenderFlow::calcInlineMinMaxWidth()
trailingSpaceChild = 0;
}
prevchild = child;
child = next(this, child);
}
......
......@@ -2034,15 +2034,14 @@ void RenderTableRow::layout()
RenderObject *child = firstChild();
while( child ) {
KHTMLAssert( child->isTableCell() );
if ( !child->layouted() ) {
RenderTableCell *cell = static_cast<RenderTableCell *>(child);
cell->calcVerticalMargins();
cell->layout();
cell->setCellTopExtra(0);
cell->setCellBottomExtra(0);
}
child = child->nextSibling();
if (child->isTableCell() && !child->layouted() ) {
RenderTableCell *cell = static_cast<RenderTableCell *>(child);
cell->calcVerticalMargins();
cell->layout();
cell->setCellTopExtra(0);
cell->setCellBottomExtra(0);
}
child = child->nextSibling();
}
setLayouted();
}
......
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