[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 6b8c630aec0aa9aeaae8ce451b03ae1be1947d42
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 6 22:01:33 2004 +0000

    	Fix whitespace rendering for brs inside pres. The bug is 3640711.
    
            Reviewed by kocienda
    
            * khtml/rendering/bidi.cpp:
            (khtml::RenderBlock::layoutInlineChildren):
            (khtml::RenderBlock::findNextLineBreak):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4282d89..9f4404a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-05-05  David Hyatt  <hyatt at apple.com>
+
+	Fix whitespace rendering for brs inside pres. The bug is 3640711.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/bidi.cpp:
+        (khtml::RenderBlock::layoutInlineChildren):
+        (khtml::RenderBlock::findNextLineBreak):
+
 2004-04-25  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 288cf52..300589c 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1459,7 +1459,7 @@ QRect RenderBlock::layoutInlineChildren(bool relayoutChildren)
                     }
                 }
                 
-                if (end == start || (end.obj && end.obj->style()->whiteSpace() == PRE && end.current() == QChar('\n'))) {
+                if (end == start || (!previousLineBrokeCleanly && end.obj && end.obj->style()->whiteSpace() == PRE && end.current() == QChar('\n'))) {
                     adjustEmbedding = true;
                     end.increment(bidi);
                     adjustEmbedding = false;
@@ -1981,8 +1981,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
                     if( *(str+pos) == '\n' && isPre) {
                         lBreak.obj = o;
                         lBreak.pos = pos;
-                        previousLineBrokeCleanly = true;
-                        
+
 #ifdef DEBUG_LINEBREAKS
                         kdDebug(6041) << "forced break sol: " << start.obj << " " << start.pos << "   end: " << lBreak.obj << " " << lBreak.pos << "   width=" << w << endl;
 #endif

-- 
WebKit Debian packaging