[webkit-changes] cvs commit: WebCore/khtml/rendering
render_table.cpp
Timothy
thatcher at opensource.apple.com
Thu Dec 22 11:59:48 PST 2005
thatcher 05/12/22 11:59:47
Modified: khtml/rendering Tag: Safari-1-3-branch render_table.cpp
Log:
Fixing a merge issue with <rdar://problem/4364640> *PanEu2* REGRESSION: Table layout issue occurs at http://www.pixar.com/shorts/index.html
Revision Changes Path
No revision
No revision
1.123.6.4 +1 -1 WebCore/khtml/rendering/render_table.cpp
Index: render_table.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_table.cpp,v
retrieving revision 1.123.6.3
retrieving revision 1.123.6.4
diff -u -r1.123.6.3 -r1.123.6.4
--- render_table.cpp 19 Nov 2005 00:12:39 -0000 1.123.6.3
+++ render_table.cpp 22 Dec 2005 19:59:46 -0000 1.123.6.4
@@ -927,7 +927,7 @@
// <TR><TD colspan="2">5
// </TABLE>
- while (cCol < nCols && cellAt(cRow, cCol).cell)
+ while (cCol < nCols && (cellAt(cRow, cCol).cell || cellAt(cRow, cCol).inColSpan))
cCol++;
if ( rSpan == 1 ) {
More information about the webkit-changes
mailing list