[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 f14a4a3da71003d559f5a23de0549e9f2c911720
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 21 22:06:32 2002 +0000

    	Fix mac.com regression (and weather.com regression).
    
            * khtml/rendering/bidi.cpp:
            (RenderFlow::findNextLineBreak):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2806 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7d39fe3..8d70cd5 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-21  David Hyatt  <hyatt at apple.com>
+
+	Fix mac.com regression (and weather.com regression).
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-11-21  Richard Williamson   <rjw at apple.com>
 
         Fixed performance regression!  Argh.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7d39fe3..8d70cd5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-11-21  David Hyatt  <hyatt at apple.com>
+
+	Fix mac.com regression (and weather.com regression).
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-11-21  Richard Williamson   <rjw at apple.com>
 
         Fixed performance regression!  Argh.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7d39fe3..8d70cd5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-11-21  David Hyatt  <hyatt at apple.com>
+
+	Fix mac.com regression (and weather.com regression).
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-11-21  Richard Williamson   <rjw at apple.com>
 
         Fixed performance regression!  Argh.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 7a0adf0..e8975fe 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1201,11 +1201,11 @@ 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)) {
+            if (o->style()->whiteSpace() != NOWRAP || last->style()->whiteSpace() != NOWRAP) {
                 w += tmpW;
                 tmpW = 0;
-                lBreak.obj = last;
-                lBreak.pos = last ? last->length() : 0;
+                lBreak.obj = o;
+                lBreak.pos = 0;
             }
 
             tmpW += o->width()+o->marginLeft()+o->marginRight();
@@ -1367,6 +1367,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
                 kdDebug() << "RenderFlow::findNextLineBreak new position at " << m_height << " newWidth " << width << endl;
 #endif
             }
+
             if( !w && w + tmpW > width+1 && (o != start.obj || (unsigned) pos != start.pos) ) {
                 // getting below floats wasn't enough...
                 //kdDebug() << "still too wide w=" << w << " tmpW = " << tmpW << " width = " << width << endl;
@@ -1386,7 +1387,10 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
             goto end;
         }
 
-        if (o->isReplaced() && o->style()->whiteSpace() != NOWRAP) {
+        last = o;
+        o = Bidinext( start.par, o );
+
+        if (last->isReplaced() && last->style()->whiteSpace() != NOWRAP) {
             // Go ahead and add in tmpW.
             w += tmpW;
             tmpW = 0;
@@ -1394,8 +1398,6 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
             lBreak.pos = 0;
         }
 
-        last = o;
-        o = Bidinext( start.par, o );
         pos = 0;
     }
 

-- 
WebKit Debian packaging