[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 38e326335b31d2a5b599c225f8a14384087059eb
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 31 00:46:03 2003 +0000

    	Fix for 3274144, floats in Help Viewer overlapped when they shouldn't have.
    	lineWidth was overflowing (and positionNewFloats was also sometimes not called
    	when it should have been).
    
            Reviewed by darin
    
            * khtml/rendering/bidi.cpp:
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4745 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2ee290b..1c9f3e2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-07-30  Dave Hyatt  <hyatt at apple.com>
 
+	Fix for 3274144, floats in Help Viewer overlapped when they shouldn't have.
+	lineWidth was overflowing (and positionNewFloats was also sometimes not called
+	when it should have been).
+	
+        Reviewed by darin
+
+        * khtml/rendering/bidi.cpp:
+        * khtml/rendering/render_block.cpp:
+
+2003-07-30  Dave Hyatt  <hyatt at apple.com>
+
 	Add support for setting the text-shadow's color.  This uses a new CG API,
 	so updating to a fairly recent Panther is required.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2ee290b..1c9f3e2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-07-30  Dave Hyatt  <hyatt at apple.com>
 
+	Fix for 3274144, floats in Help Viewer overlapped when they shouldn't have.
+	lineWidth was overflowing (and positionNewFloats was also sometimes not called
+	when it should have been).
+	
+        Reviewed by darin
+
+        * khtml/rendering/bidi.cpp:
+        * khtml/rendering/render_block.cpp:
+
+2003-07-30  Dave Hyatt  <hyatt at apple.com>
+
 	Add support for setting the text-shadow's color.  This uses a new CG API,
 	so updating to a fairly recent Panther is required.
 	
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index b4db617..4743756 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1388,13 +1388,8 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
             // add to special objects...
             if (o->isFloating()) {
                 insertFloatingObject(o);
-                // check if it fits in the current line.
-                // If it does, position it now, otherwise, position
-                // it after moving to next line (in newLine() func)
-                if (o->width()+o->marginLeft()+o->marginRight()+w+tmpW <= width) {
-                    positionNewFloats();
-                    width = lineWidth(m_height);
-                }
+                positionNewFloats();
+                width = lineWidth(m_height);
             }
             else if (o->isPositioned()) {
                 if (o->hasStaticX())
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index fde177f..4f61672 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1460,7 +1460,8 @@ unsigned short
 RenderBlock::lineWidth(int y) const
 {
     //kdDebug( 6040 ) << "lineWidth(" << y << ")=" << rightOffset(y) - leftOffset(y) << endl;
-    return rightOffset(y) - leftOffset(y);
+    int result = rightOffset(y) - leftOffset(y);
+    return (result < 0) ? 0 : result;
 }
 
 int

-- 
WebKit Debian packaging