[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 2a42417c35899f7731b01b3edf313c5aa8a06c39
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 26 01:46:51 2003 +0000

    	Regression caused by my inclusion of inline flows in the bidi
    	iteration.  These flows are always empty and should be skipped
    	if found at the start of a line.
    
    	The bug # is 3175670.
    
            Reviewed by NOBODY (OOPS!).
    
            * khtml/rendering/bidi.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3699 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b6a7bab..041300c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2003-02-25  David Hyatt  <hyatt at apple.com>
 
+	Regression caused by my inclusion of inline flows in the bidi 
+	iteration.  These flows are always empty and should be skipped
+	if found at the start of a line.
+
+	The bug # is 3175670.
+	
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/rendering/bidi.cpp:
+
+2003-02-25  David Hyatt  <hyatt at apple.com>
+
 	Fix for bug 3166276.  <tt> uses wrong font size inside a table.
 	Make sure logical font values like "medium" don't set the "size
 	specified" bit on the font, so that the generic family change
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b6a7bab..041300c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2003-02-25  David Hyatt  <hyatt at apple.com>
 
+	Regression caused by my inclusion of inline flows in the bidi 
+	iteration.  These flows are always empty and should be skipped
+	if found at the start of a line.
+
+	The bug # is 3175670.
+	
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/rendering/bidi.cpp:
+
+2003-02-25  David Hyatt  <hyatt at apple.com>
+
 	Fix for bug 3166276.  <tt> uses wrong font size inside a table.
 	Make sure logical font values like "medium" don't set the "size
 	specified" bit on the font, so that the generic family change
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 9460481..0598d87 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1308,14 +1308,15 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
 #endif
 
     // eliminate spaces at beginning of line
-        // remove leading spaces
-    while(!start.atEnd() && start.obj->style()->whiteSpace() != PRE &&
+    // remove leading spaces.  Any inline flows we encounter will be empty and should also
+    // be skipped.
+    while(!start.atEnd() && (start.obj->isInlineFlow() || (start.obj->style()->whiteSpace() != PRE &&
 #ifndef QT_NO_UNICODETABLES
           ( start.direction() == QChar::DirWS || start.obj->isSpecial() )
 #else
           ( start.current() == ' ' || start.obj->isSpecial() )
 #endif
-          ) {
+          ))) {
         if( start.obj->isSpecial() ) {
             RenderObject *o = start.obj;
             // add to special objects...

-- 
WebKit Debian packaging