[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 2df521918ce605cba20848ba460be7fdeb61ab7f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 28 22:05:02 2003 +0000

    	Fix a regression caused by my addition of nearestFloatBottom
    	to the code.  I needed to make that a loop rather than just call
    	it once, since the nearestFloatBottom could be a bad position
    	for the next line.
    
    	This fixes the overlapping text problem at CNN: 3186593.
    
            Reviewed by john
    
            * khtml/rendering/bidi.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3958 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cf0f2e4..00a7907 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-03-28  David Hyatt  <hyatt at apple.com>
+
+	Fix a regression caused by my addition of nearestFloatBottom
+	to the code.  I needed to make that a loop rather than just call
+	it once, since the nearestFloatBottom could be a bad position
+	for the next line.
+
+	This fixes the overlapping text problem at CNN: 3186593.
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+
 2003-03-28  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cf0f2e4..00a7907 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-03-28  David Hyatt  <hyatt at apple.com>
+
+	Fix a regression caused by my addition of nearestFloatBottom
+	to the code.  I needed to make that a loop rather than just call
+	it once, since the nearestFloatBottom could be a bad position
+	for the next line.
+
+	This fixes the overlapping text problem at CNN: 3186593.
+	
+        Reviewed by john
+
+        * khtml/rendering/bidi.cpp:
+
 2003-03-28  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index f5e0f1c..6cd4aaf 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1595,6 +1595,15 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
                     if ( !isPre && 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,
+                        // keep adjusting our float bottom until we find some room.
+                        int lastFloatBottom = m_height;
+                        while (lastFloatBottom < fb && tmpW > newLineWidth) {
+                            lastFloatBottom = fb;
+                            fb = nearestFloatBottom(fb);
+                            newLineWidth = lineWidth(fb);
+                        }
+                        
                         if(!w && m_height < fb && width < newLineWidth) {
                             m_height = fb;
                             width = newLineWidth;
@@ -1730,6 +1739,14 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
             
             int fb = nearestFloatBottom(m_height);
             int newLineWidth = lineWidth(fb);
+            // See if |tmpW| will fit on the new line.  As long as it does not,
+            // keep adjusting our float bottom until we find some room.
+            int lastFloatBottom = m_height;
+            while (lastFloatBottom < fb && tmpW > newLineWidth) {
+                lastFloatBottom = fb;
+                fb = nearestFloatBottom(fb);
+                newLineWidth = lineWidth(fb);
+            }            
             if( !w && m_height < fb && width < newLineWidth ) {
                 m_height = fb;
                 width = newLineWidth;

-- 
WebKit Debian packaging