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

[David]

hyatt       05/10/03 22:42:36

  Modified:    .        ChangeLog
               khtml/rendering render_box.cpp
  Log:
  	Fix regression caused by variable->auto change.  Accidentally removed a line of code from calcWidthUsing.
  
          Reviewed by mjs
  
          * khtml/rendering/render_box.cpp:
          (RenderBox::calcWidthUsing):
  
  Revision  Changes    Path
  1.193     +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.192
  retrieving revision 1.193
  diff -u -r1.192 -r1.193
  --- ChangeLog	4 Oct 2005 01:59:54 -0000	1.192
  +++ ChangeLog	4 Oct 2005 05:42:32 -0000	1.193
  @@ -1,3 +1,12 @@
  +2005-10-03  David Hyatt  <hyatt at apple.com>
  +
  +	Fix regression caused by variable->auto change.  Accidentally removed a line of code from calcWidthUsing.
  +	
  +        Reviewed by mjs
  +
  +        * khtml/rendering/render_box.cpp:
  +        (RenderBox::calcWidthUsing):
  +
   2005-10-03  Justin Garcia  <justin.garcia at apple.com>
   
           Reviewed by darin
  
  
  
  1.170     +2 -0      WebCore/khtml/rendering/render_box.cpp
  
  Index: render_box.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_box.cpp,v
  retrieving revision 1.169
  retrieving revision 1.170
  diff -u -r1.169 -r1.170
  --- render_box.cpp	3 Oct 2005 21:12:38 -0000	1.169
  +++ render_box.cpp	4 Oct 2005 05:42:35 -0000	1.170
  @@ -935,6 +935,8 @@
       else
           w = style()->maxWidth();
   
  +    lengthType = w.type;
  +
       if (w.isIntrinsicOrAuto()) {
           int marginLeft = style()->marginLeft().minWidth(cw);
           int marginRight = style()->marginRight().minWidth(cw);