[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 a408e2ee859755f4b93f30834cc5fa1815abcb02
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 18 07:33:02 2002 +0000

    	NOWRAP was completely broken.  This fixes the problem
    	and makes porsche.com look ok again.
    
    	Bug #3131287.
    
            Reviewed by gramps
    
            * khtml/rendering/bidi.cpp:
            (RenderFlow::findNextLineBreak):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3117 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 090c156..e5da5f9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-17  David Hyatt  <hyatt at apple.com>
+
+	NOWRAP was completely broken.  This fixes the problem
+	and makes porsche.com look ok again.
+
+	Bug #3131287.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-12-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 090c156..e5da5f9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-17  David Hyatt  <hyatt at apple.com>
+
+	NOWRAP was completely broken.  This fixes the problem
+	and makes porsche.com look ok again.
+
+	Bug #3131287.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
 2002-12-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index b3e3a11..1ca0279 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1251,6 +1251,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
             // proportional font, needs a bit more work.
             int lastSpace = pos;
             bool isPre = o->style()->whiteSpace() == PRE;
+            
             //QChar space[1]; space[0] = ' ';
             //int spaceWidth = f->width(space, 1, 0);
             while(len) {
@@ -1305,7 +1306,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
                         }
                     }
         
-                    if ( !isPre && w + tmpW > width )
+                    if (w + tmpW > width && o->style()->whiteSpace() == NORMAL)
                         goto end;
 
                     lBreak.obj = o;
@@ -1425,7 +1426,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
 #ifdef DEBUG_LINEBREAKS
     kdDebug( 6041 ) << "end of par, width = " << width << " linewidth = " << w + tmpW << endl;
 #endif
-    if( w + tmpW <= width ) {
+    if( w + tmpW <= width || (last && last->style()->whiteSpace() == NOWRAP)) {
         lBreak.obj = 0;
         lBreak.pos = 0;
     }

-- 
WebKit Debian packaging