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

[David]

hyatt       05/11/01 16:49:21

  Modified:    .        ChangeLog
               khtml/rendering render_box.cpp
  Log:
  	Fix for bug 5580, slashdot regression with percentage height
  	blocks.
  
          Reviewed by darin
  
  	Added fast/block/basic/021.html
  
          * khtml/rendering/render_box.cpp:
          (RenderBox::calcPercentageHeight):
  
  Revision  Changes    Path
  1.326     +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.325
  retrieving revision 1.326
  diff -u -r1.325 -r1.326
  --- ChangeLog	1 Nov 2005 22:29:15 -0000	1.325
  +++ ChangeLog	2 Nov 2005 00:49:15 -0000	1.326
  @@ -1,3 +1,15 @@
  +2005-11-01  David Hyatt  <hyatt at apple.com>
  +
  +	Fix for bug 5580, slashdot regression with percentage height
  +	blocks.
  +	
  +        Reviewed by darin
  +
  +	Added fast/block/basic/021.html
  +	
  +        * khtml/rendering/render_box.cpp:
  +        (RenderBox::calcPercentageHeight):
  +
   2005-11-01  Justin Garcia  <justin.garcia at apple.com>
   
           Reviewed by harrison
  
  
  
  1.176     +5 -2      WebCore/khtml/rendering/render_box.cpp
  
  Index: render_box.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
  retrieving revision 1.175
  retrieving revision 1.176
  diff -u -r1.175 -r1.176
  --- render_box.cpp	28 Oct 2005 08:42:14 -0000	1.175
  +++ render_box.cpp	2 Nov 2005 00:49:21 -0000	1.176
  @@ -1198,9 +1198,12 @@
       // height.
       else if (cb->style()->height().isFixed())
           result = cb->calcContentBoxHeight(cb->style()->height().value);
  -    else if (cb->style()->height().isPercent())
  +    else if (cb->style()->height().isPercent()) {
           // We need to recur and compute the percentage height for our containing block.
  -        result = cb->calcContentBoxHeight(cb->calcPercentageHeight(cb->style()->height()));
  +        result = cb->calcPercentageHeight(cb->style()->height());
  +        if (result != -1)
  +            result = cb->calcContentBoxHeight(result);
  +    }
       else if (cb->isCanvas() || (cb->isBody() && style()->htmlHacks())) {
           // Don't allow this to affect the block' m_height member variable, since this
           // can get called while the block is still laying out its kids.