[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 39e4e3e6568d19c738f578a86fc43a855423f57b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 30 05:45:47 2003 +0000

    	Fix for 3466802.  When breaking on a newline, "pre" is determined by checking the actual object that
    	the line broke on, and not by simply checking the "pre" status of the containing block.
    
            Reviewed by mjs
    
            * khtml/rendering/bidi.cpp:
            (khtml::RenderBlock::layoutInlineChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5310 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index df93868..caed66e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-10-29  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3466802.  When breaking on a newline, "pre" is determined by checking the actual object that
+	the line broke on, and not by simply checking the "pre" status of the containing block.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/bidi.cpp:
+        (khtml::RenderBlock::layoutInlineChildren):
+
+2003-10-29  David Hyatt  <hyatt at apple.com>
+
 	Add the paged media properties to RenderStyle.  They aren't used yet, but they should now be 
 	parsed and interpreted correctly.
 	
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index fe1e08a..84cb5b8 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1393,7 +1393,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren)
                     adjustEmbeddding = true;
                     end.increment(bidi);
                     adjustEmbeddding = false;
-                } else if(m_pre && end.current() == QChar('\n') ) {
+                } else if (end.obj && end.obj->style()->whiteSpace() == PRE && end.current() == QChar('\n')) {
                     adjustEmbeddding = true;
                     end.increment(bidi);
                     adjustEmbeddding = false;

-- 
WebKit Debian packaging