a simple pre bug fix

[David Hyatt]

Index: ChangeLog
===================================================================
RCS file: /local/home/cvs/Labyrinth/WebCore/ChangeLog,v
retrieving revision 1.2150
diff -u -p -r1.2150 ChangeLog
--- ChangeLog	2003/10/30 05:12:54	1.2150
+++ ChangeLog	2003/10/30 05:18:00
@@ -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 NOBODY (OOPS!).
+
+        * 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.
 	
Index: khtml/rendering/bidi.cpp
===================================================================
RCS file: /local/home/cvs/Labyrinth/WebCore/khtml/rendering/bidi.cpp,v
retrieving revision 1.78
diff -u -p -r1.78 khtml/rendering/bidi.cpp
--- khtml/rendering/bidi.cpp	2003/10/29 08:57:20	1.78
+++ khtml/rendering/bidi.cpp	2003/10/30 05:18:13
@@ -1393,7 +1393,7 @@ void RenderBlock::layoutInlineChildren(b
                     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;
-------------- next part --------------


dave