[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 711fe23727632821f59f18a58285e3e67f01882c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 20 21:25:14 2002 +0000

    	Fix the mac.com line-breaking bug.  This was not a regression
    	but was present in Konq.
    
            * khtml/rendering/bidi.cpp:
            (RenderFlow::findNextLineBreak):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2784 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4696257..90cea1f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-11-20  David Hyatt  <hyatt at apple.com>
+
+	Fix the mac.com line-breaking bug.  This was not a regression
+	but was present in Konq.
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-11-20  Maciej Stachowiak  <mjs at apple.com>
 
         * force-js-clean-timestamp: Work around PB lameness yet again.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4696257..90cea1f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-11-20  David Hyatt  <hyatt at apple.com>
+
+	Fix the mac.com line-breaking bug.  This was not a regression
+	but was present in Konq.
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-11-20  Maciej Stachowiak  <mjs at apple.com>
 
         * force-js-clean-timestamp: Work around PB lameness yet again.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4696257..90cea1f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-11-20  David Hyatt  <hyatt at apple.com>
+
+	Fix the mac.com line-breaking bug.  This was not a regression
+	but was present in Konq.
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-11-20  Maciej Stachowiak  <mjs at apple.com>
 
         * force-js-clean-timestamp: Work around PB lameness yet again.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index f855c4a..7a0adf0 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1201,6 +1201,13 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
                 static_cast<RenderFlow*>(o->containingBlock())->insertSpecialObject(o);
             }
         } else if ( o->isReplaced() ) {
+            if (o->style()->whiteSpace() != NOWRAP || (!last || last->style()->whiteSpace() != NOWRAP)) {
+                w += tmpW;
+                tmpW = 0;
+                lBreak.obj = last;
+                lBreak.pos = last ? last->length() : 0;
+            }
+
             tmpW += o->width()+o->marginLeft()+o->marginRight();
             if (ignoringSpaces) {
                 BidiIterator* startMid = new (o->renderArena()) BidiIterator();
@@ -1282,7 +1289,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
 
                     lBreak.obj = o;
                     lBreak.pos = pos;
-    
+                    
                     if( *(str+pos) == '\n' && isPre) {
 #ifdef DEBUG_LINEBREAKS
                         kdDebug(6041) << "forced break sol: " << start.obj << " " << start.pos << "   end: " << lBreak.obj << " " << lBreak.pos << "   width=" << w << endl;
@@ -1344,7 +1351,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
         } else
             KHTMLAssert( false );
 
-        if( w + tmpW > width+1 && style()->whiteSpace() != NOWRAP && o->style()->whiteSpace() != NOWRAP ) {
+        if( w + tmpW > width+1 && o->style()->whiteSpace() != NOWRAP ) {
             //kdDebug() << " too wide w=" << w << " tmpW = " << tmpW << " width = " << width << endl;
             //kdDebug() << "start=" << start.obj << " current=" << o << endl;
             // if we have floats, try to get below them.
@@ -1366,19 +1373,27 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
                 lBreak.obj = o;
                 if(last != o) {
                     //kdDebug() << " using last " << last << endl;
-                    //lBreak.obj = last;
-                    lBreak.pos = 0;//last->length() - 1;
+                    lBreak.pos = 0;
                 }
                 else if ( unsigned ( pos ) >= o->length() ) {
                     lBreak.obj = Bidinext( start.par, o );
                     lBreak.pos = 0;
                 }
-                else
+                else {
                     lBreak.pos = pos;
+                }
             }
             goto end;
         }
 
+        if (o->isReplaced() && o->style()->whiteSpace() != NOWRAP) {
+            // Go ahead and add in tmpW.
+            w += tmpW;
+            tmpW = 0;
+            lBreak.obj = o;
+            lBreak.pos = 0;
+        }
+
         last = o;
         o = Bidinext( start.par, o );
         pos = 0;

-- 
WebKit Debian packaging