[webkit-changes] cvs commit: WebCore/manual-tests overlappingTableSpans.html

Fri Nov 18 15:42:07 PST 2005

bdakin      05/11/18 15:42:06

  Modified:    .        ChangeLog
               khtml/rendering render_table.cpp
  Added:       manual-tests overlappingTableSpans.html
  Log:
  Bug #:
  
  Revision  Changes    Path
  1.382     +16 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.381
  retrieving revision 1.382
  diff -u -r1.381 -r1.382
  --- ChangeLog	18 Nov 2005 21:34:35 -0000	1.381
  +++ ChangeLog	18 Nov 2005 23:42:02 -0000	1.382
  @@ -1,3 +1,19 @@
  +2005-11-18  Beth Dakin  <bdakin at apple.com>
  +
  +        Reviewed by Darin.
  +
  +	This is an additional fix for <rdar://problem/3871165> text box 
  +	in nested table disappears when you click on it (3452) (Safari 
  +	PSOFT: US EDU PS8: Lead List searches). The test case I used 
  +	previously did not cover the case where one cell has both a
  +	rowspan and a colspan and other cells later have rowspan and
  +	colspan from two different cells overlapping.
  +
  +        One manual test case added.
  +
  +        * khtml/rendering/render_table.cpp: Remove check for inColSpan
  +        (RenderTableSection::addCell):
  +
   2005-11-18  David Harrison  <harrison at apple.com>
   
           <http://bugzilla.opendarwin.org/show_bug.cgi?id=5629>
  
  
  
  1.140     +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.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- render_table.cpp	17 Nov 2005 23:40:01 -0000	1.139
  +++ render_table.cpp	18 Nov 2005 23:42:06 -0000	1.140
  @@ -878,7 +878,7 @@
       // <TR><TD colspan="2">5
       // </TABLE>
   
  -    while (cCol < nCols && (cellAt(cRow, cCol).cell || cellAt(cRow, cCol).inColSpan))
  +    while (cCol < nCols && cellAt(cRow, cCol).cell)
   	cCol++;
   
       if (rSpan == 1) {
  
  
  
  1.1                  WebCore/manual-tests/overlappingTableSpans.html
  
  Index: overlappingTableSpans.html
  ===================================================================
  <html>
  	<body>
  		<table>
  			<tr>
  				<td width='1'></td>
  			</tr>
  			<tr>
  				<td colspan='2' rowspan='2'></td>
  			</tr>
  			<tr>
  				<td rowspan='2'></td>
  			</tr>
  			<tr>
  				<td colspan='2'>
  					<table>
  						<tr>
  							<td></td>
  							<td>
  								<input type='text' />
  							</td>
  						</tr>
  					</table>
  				</td>
  			</tr>
  		</table>
  	</body>
  </html>