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

[Timothy]

thatcher    05/11/11 11:38:02

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/rendering Tag: Safari-2-0-branch render_flexbox.cpp
  Log:
          Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4170
          and <rdar://problem/3849434> SLIDER: Article length goes from a
          subject line, back to the whole article, when decreasing (4170)
  
          Patch by Ricci Adams
          Reviewed by Dave Hyatt
  
          * khtml/rendering/render_flexbox.cpp:
           (RenderFlexibleBox::layoutVerticalBox): clamp the value
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.55  +12 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.54
  retrieving revision 1.1.2.55
  diff -u -r1.1.2.54 -r1.1.2.55
  --- ChangeLog	11 Nov 2005 18:21:01 -0000	1.1.2.54
  +++ ChangeLog	11 Nov 2005 19:37:57 -0000	1.1.2.55
  @@ -1,5 +1,17 @@
   2005-11-11  Timothy Hatcher  <timothy at apple.com>
   
  +        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4170
  +        and <rdar://problem/3849434> SLIDER: Article length goes from a 
  +        subject line, back to the whole article, when decreasing (4170)
  +
  +        Patch by Ricci Adams
  +        Reviewed by Dave Hyatt
  +
  +        * khtml/rendering/render_flexbox.cpp:
  +         (RenderFlexibleBox::layoutVerticalBox): clamp the value
  +
  +2005-11-11  Timothy Hatcher  <timothy at apple.com>
  +
           Merged fix from TOT to Safari-2-0-branch
   
       2005-11-11  Beth Dakin  <bdakin at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.21.12.2 +1 -0      WebCore/khtml/rendering/render_flexbox.cpp
  
  Index: render_flexbox.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_flexbox.cpp,v
  retrieving revision 1.21.12.1
  retrieving revision 1.21.12.2
  diff -u -r1.21.12.1 -r1.21.12.2
  --- render_flexbox.cpp	5 Aug 2005 18:01:23 -0000	1.21.12.1
  +++ render_flexbox.cpp	11 Nov 2005 19:38:02 -0000	1.21.12.2
  @@ -727,6 +727,7 @@
                   if (lineCount <= numVisibleLines) continue;
                   
                   int newHeight = blockChild->heightForLineCount(numVisibleLines);
  +                if (newHeight == -1 && numVisibleLines == 0) newHeight = 0;
                   if (newHeight == child->height()) continue;
                   
                   child->setChildNeedsLayout(true);