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

Thu Oct 6 15:45:47 PDT 2005

bdakin      05/10/06 15:45:47

  Modified:    .        ChangeLog
               .        ChangeLog
               khtml/rendering render_block.cpp
  Added:       fast/block/float 4145535Crash-expected.checksum
                        4145535Crash-expected.png 4145535Crash-expected.txt
                        4145535Crash.html
  Log:
  
  
  Revision  Changes    Path
  1.15      +10 -0     LayoutTests/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/LayoutTests/ChangeLog,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ChangeLog	6 Oct 2005 15:46:14 -0000	1.14
  +++ ChangeLog	6 Oct 2005 22:45:41 -0000	1.15
  @@ -1,3 +1,13 @@
  +2005-10-06  Beth Dakin  <bdakin at apple.com>
  +
  +        Test cases for <rdar://problem/4145535> Crash in khtml::RenderBlock::addOverhangingFloats 
  +	with simple HTML test file. The fix is in WebCore.
  +
  +        * fast/block/float/4145535Crash-expected.checksum: Added.
  +        * fast/block/float/4145535Crash-expected.png: Added.
  +        * fast/block/float/4145535Crash-expected.txt: Added.
  +        * fast/block/float/4145535Crash.html: Added.
  +
   2005-10-06  Darin Adler  <darin at apple.com>
   
           - updated test result for synthetic bold
  
  
  
  1.1                  LayoutTests/fast/block/float/4145535Crash-expected.checksum
  
  Index: 4145535Crash-expected.checksum
  ===================================================================
  853de00567d121bea0b7bece66a5d61c
  
  
  1.1                  LayoutTests/fast/block/float/4145535Crash-expected.png
  
  	<<Binary file>>
  
  
  1.1                  LayoutTests/fast/block/float/4145535Crash-expected.txt
  
  Index: 4145535Crash-expected.txt
  ===================================================================
  layer at (0,0) size 800x600
    RenderCanvas at (0,0) size 800x600
  layer at (0,0) size 800x600
    RenderBlock {HTML} at (0,0) size 800x600
      RenderBody {BODY} at (8,8) size 784x584
        RenderBlock (anonymous) at (0,0) size 784x150
          RenderPartObject {EMBED} at (0,0) size 300x150
        RenderTable {TABLE} at (0,150) size -2x-1
          RenderTableSection {TBODY} at (0,0) size 0x-1
  
  
  
  1.1                  LayoutTests/fast/block/float/4145535Crash.html
  
  Index: 4145535Crash.html
  ===================================================================
  <table
  CELLSPACING=8888888888
  <EMBED UNITS="4">
  
  
  1.213     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- ChangeLog	6 Oct 2005 22:06:47 -0000	1.212
  +++ ChangeLog	6 Oct 2005 22:45:42 -0000	1.213
  @@ -1,3 +1,13 @@
  +2005-10-06  Beth Dakin  <bdakin at apple.com>
  +
  +        Reviewed by Vicki.
  +
  +	Fix for <rdar://problem/4145535> Crash in khtml::RenderBlock::addOverhangingFloats 
  +	with simple HTML test file.
  +
  +        * khtml/rendering/render_block.cpp: Added nil check
  +        (khtml::RenderBlock::addOverhangingFloats):
  +
   2005-10-06  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Beth Dakin.
  
  
  
  1.209     +1 -1      WebCore/khtml/rendering/render_block.cpp
  
  Index: render_block.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_block.cpp,v
  retrieving revision 1.208
  retrieving revision 1.209
  diff -u -r1.208 -r1.209
  --- render_block.cpp	6 Oct 2005 00:53:55 -0000	1.208
  +++ render_block.cpp	6 Oct 2005 22:45:46 -0000	1.209
  @@ -2268,7 +2268,7 @@
   void RenderBlock::addOverhangingFloats(RenderBlock* child, int xoff, int yoff)
   {
       // Prevent floats from being added to the canvas by the root element, e.g., <html>.
  -    if (child->hasOverflowClip() || !child->hasOverhangingFloats() || child->isRoot())
  +    if (child->hasOverflowClip() || !child->hasOverhangingFloats() || !child->m_floatingObjects || child->isRoot())
           return;
   
       QPtrListIterator<FloatingObject> it(*child->m_floatingObjects);