[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 74eec4d4e6a8cd91c6db021f550b37e14931cca5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Mar 23 08:02:47 2003 +0000

    	Fix the top of the gamespot.com page on the PLT.  The
    	clear status for <br> should be ignored if/when we decide
    	to ignore the <br> because the previous line didn't break
    	cleanly.
    
            Reviewed by gramps
    
            * khtml/rendering/bidi.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1cd2dd7..07d1afd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-03-22  David Hyatt  <hyatt at apple.com>
 
+	Fix the top of the gamespot.com page on the PLT.  The
+	clear status for <br> should be ignored if/when we decide
+	to ignore the <br> because the previous line didn't break 
+	cleanly.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/bidi.cpp:
+
+2003-03-22  David Hyatt  <hyatt at apple.com>
+
 	Loosen up the DTD for <dl>, <dt>, and <dd> so that they can
 	occur anywhere in a document and be independent of one 
 	another.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1cd2dd7..07d1afd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-03-22  David Hyatt  <hyatt at apple.com>
 
+	Fix the top of the gamespot.com page on the PLT.  The
+	clear status for <br> should be ignored if/when we decide
+	to ignore the <br> because the previous line didn't break 
+	cleanly.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/bidi.cpp:
+
+2003-03-22  David Hyatt  <hyatt at apple.com>
+
 	Loosen up the DTD for <dl>, <dt>, and <dd> so that they can
 	occur anywhere in a document and be independent of one 
 	another.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 7d9f273..f5e0f1c 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1341,7 +1341,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren)
                 m_firstLine = false;
                 newLine();
             }
-
+             
             sNumMidpoints = 0;
             sCurrMidpoint = 0;
             sCompactFirstBidiRun = sCompactLastBidiRun = 0;
@@ -1460,11 +1460,12 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
                     isLineEmpty = false;
                 trailingSpaceObject = 0;
                 previousLineBrokeAtBR = true;
-                
-                //check the clear status
-                EClear clear = o->style()->clear();
-                if(clear != CNONE) {
-                    m_clearStatus = (EClear) (m_clearStatus | clear);
+
+                if (!isLineEmpty) {
+                    // only check the clear status for non-empty lines.
+                    EClear clear = o->style()->clear();
+                    if(clear != CNONE)
+                        m_clearStatus = (EClear) (m_clearStatus | clear);
                 }
             }
             goto end;
@@ -1686,7 +1687,12 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
         RenderObject* next = Bidinext(start.par, o);
         bool isNormal = o->style()->whiteSpace() == NORMAL;
         bool checkForBreak = isNormal;
-        if (next && o->isText() && next->isText() && !next->isBR()) {
+        if (o->style()->whiteSpace() == NOWRAP && last &&
+            last->style()->whiteSpace() == NORMAL &&
+            w + tmpW > width+1 &&
+            lBreak.obj == last)
+            checkForBreak = true;
+        else if (next && o->isText() && next->isText() && !next->isBR()) {
             if (isNormal || (next->style()->whiteSpace() == NORMAL)) {
                 if (currentCharacterIsSpace)
                     checkForBreak = true;

-- 
WebKit Debian packaging