[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit a14d1741a2d6a0b5059adb6ce151fb459f2b233f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 2 20:25:46 2003 +0000

    	Fix for bug #3137935.  When a float causes a line to get
    	moved down past the float, the line would incorrectly break
    	rather than expanding to use the newly-available width.
    
            Reviewed by darin.
    
            * khtml/rendering/bidi.cpp:
            (RenderFlow::findNextLineBreak):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3443138..2b45800 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-02  David Hyatt  <hyatt at apple.com>
+
+	Fix for bug #3137935.  When a float causes a line to get
+	moved down past the float, the line would incorrectly break
+	rather than expanding to use the newly-available width.
+	
+        Reviewed by darin.
+
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2003-01-02  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3443138..2b45800 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-02  David Hyatt  <hyatt at apple.com>
+
+	Fix for bug #3137935.  When a float causes a line to get
+	moved down past the float, the line would incorrectly break
+	rather than expanding to use the newly-available width.
+	
+        Reviewed by darin.
+
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2003-01-02  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 984699a..ab220f1 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1393,7 +1393,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
             // if we have floats, try to get below them.
             if (sawSpace && !ignoringSpaces && o->style()->whiteSpace() != PRE)
                 trailingSpaceObject = 0;
-                
+            
             int fb = floatBottom();
             int newLineWidth = lineWidth(fb);
             if( !w && m_height < fb && width < newLineWidth ) {
@@ -1420,7 +1420,12 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
                     lBreak.pos = pos;
                 }
             }
-            goto end;
+            
+            // |width| may have been adjusted because we got shoved down past a float (thus
+            // giving us more room), so we need to retest, and only jump to
+            // the end label if we still don't fit on the line. -dwh
+            if (w + tmpW > width+1)
+                goto end;
         }
         
         last = o;

-- 
WebKit Debian packaging