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

Thu Nov 3 21:59:07 PST 2005

thatcher    05/11/03 21:59:07

  Modified:    .        Tag: Ti-2005-009-branch ChangeLog
               khtml/rendering Tag: Ti-2005-009-branch render_block.cpp
  Log:
          Merged fix from TOT to Ti-2005-009-branch
  
      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):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.23.2.15.2.1 +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.23.2.15
  retrieving revision 1.1.2.23.2.15.2.1
  diff -u -r1.1.2.23.2.15 -r1.1.2.23.2.15.2.1
  --- ChangeLog	22 Oct 2005 19:59:24 -0000	1.1.2.23.2.15
  +++ ChangeLog	4 Nov 2005 05:59:01 -0000	1.1.2.23.2.15.2.1
  @@ -1,3 +1,17 @@
  +2005-11-03  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Ti-2005-009-branch
  +
  +    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):
  +
   === WebCore-416.13 ===
   
   2005-10-21  Dave Harrison  <harrison at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.179.8.4.4.1 +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.179.8.4
  retrieving revision 1.179.8.4.4.1
  diff -u -r1.179.8.4 -r1.179.8.4.4.1
  --- render_block.cpp	9 Aug 2005 23:52:15 -0000	1.179.8.4
  +++ render_block.cpp	4 Nov 2005 05:59:05 -0000	1.179.8.4.4.1
  @@ -2263,7 +2263,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);