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

[David]

hyatt       05/10/09 20:50:23

  Modified:    .        ChangeLog
               khtml/rendering Tag: Safari-2-0-branch bidi.cpp
  Log:
  	Land fix for bugzilla bug 4974, make sure to only move below floats in line layout if white-space is normal.
  	One case was using !isPre and including nowrap incorrectly as a result.  Patch from koivisto.
  
          Reviewed by hyatt
  
          * khtml/rendering/bidi.cpp:
          (khtml::RenderBlock::findNextLineBreak):
  
  Revision  Changes    Path
  1.226     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.225
  retrieving revision 1.226
  diff -u -r1.225 -r1.226
  --- ChangeLog	9 Oct 2005 04:17:30 -0000	1.225
  +++ ChangeLog	10 Oct 2005 03:50:20 -0000	1.226
  @@ -1,3 +1,13 @@
  +2005-10-09  David Hyatt  <hyatt at apple.com>
  +
  +	Land fix for bugzilla bug 4974, make sure to only move below floats in line layout if white-space is normal.
  +	One case was using !isPre and including nowrap incorrectly as a result.  Patch from koivisto.
  +	
  +        Reviewed by hyatt
  +
  +        * khtml/rendering/bidi.cpp:
  +        (khtml::RenderBlock::findNextLineBreak):
  +
   2005-10-08  Alexey Proskuryakov  <ap at nypop.com>
   
           Reviewed by Maciej.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.125.8.7 +1 -1      WebCore/khtml/rendering/bidi.cpp
  
  Index: bidi.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/bidi.cpp,v
  retrieving revision 1.125.8.6
  retrieving revision 1.125.8.7
  diff -u -r1.125.8.6 -r1.125.8.7
  --- bidi.cpp	16 Aug 2005 00:38:12 -0000	1.125.8.6
  +++ bidi.cpp	10 Oct 2005 03:50:22 -0000	1.125.8.7
  @@ -2129,7 +2129,7 @@
   #ifdef DEBUG_LINEBREAKS
                       kdDebug(6041) << "found space at " << pos << " in string '" << QString( str, strlen ).latin1() << "' adding " << tmpW << " new width = " << w << endl;
   #endif
  -                    if ( !isPre && w + tmpW > width && w == 0 ) {
  +                    if (isNormal && w + tmpW > width && w == 0) {
                           int fb = nearestFloatBottom(m_height);
                           int newLineWidth = lineWidth(fb);
                           // See if |tmpW| will fit on the new line.  As long as it does not,