[webkit-changes] cvs commit: WebCore/khtml/rendering render_table.cpp

[Timothy]

thatcher    05/11/18 16:12:41

  Modified:    .        Tag: Safari-1-3-branch ChangeLog
               khtml/rendering Tag: Safari-1-3-branch render_table.cpp
  Log:
          Merged fix from TOT to Safari-1-3-branch
  
      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):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.335.2.31 +20 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.335.2.30
  retrieving revision 1.335.2.31
  diff -u -r1.335.2.30 -r1.335.2.31
  --- ChangeLog	18 Nov 2005 23:38:54 -0000	1.335.2.30
  +++ ChangeLog	19 Nov 2005 00:12:33 -0000	1.335.2.31
  @@ -2,6 +2,26 @@
   
           Merged fix from TOT to Safari-1-3-branch
   
  +    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  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-1-3-branch
  +
       2005-11-18  David Harrison  <harrison at apple.com>
   
           <http://bugzilla.opendarwin.org/show_bug.cgi?id=5629>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.123.6.3 +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.2
  retrieving revision 1.123.6.3
  diff -u -r1.123.6.2 -r1.123.6.3
  --- render_table.cpp	17 Nov 2005 22:36:37 -0000	1.123.6.2
  +++ render_table.cpp	19 Nov 2005 00:12:39 -0000	1.123.6.3
  @@ -927,7 +927,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 ) {