[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 3a2911df49f9ed853bdd575f70a16b957714e212
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 2 22:28:26 2003 +0000

    	Fix for 3359408, DirWS should not be used when collapsing/stripping spaces,
    	since only ASCII spaces are supposed to be collapsed/stripped.
    
            Reviewed by mjs
    
            * khtml/rendering/bidi.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4926 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b5dd642..8b92539 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-09-02  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3359408, DirWS should not be used when collapsing/stripping spaces,
+	since only ASCII spaces are supposed to be collapsed/stripped.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/bidi.cpp:
+
 2003-09-02  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b5dd642..8b92539 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-09-02  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3359408, DirWS should not be used when collapsing/stripping spaces,
+	since only ASCII spaces are supposed to be collapsed/stripped.
+	
+        Reviewed by mjs
+
+        * khtml/rendering/bidi.cpp:
+
 2003-09-02  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index d5de0fb..3ed9b23 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1405,13 +1405,8 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
     // eliminate spaces at beginning of line
     // 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->isFloatingOrPositioned())
-#else
-          ( start.current() == ' ' || start.obj->isFloatingOrPositioned())
-#endif
-          ))) {
+    while (!start.atEnd() && (start.obj->isInlineFlow() || (start.obj->style()->whiteSpace() != PRE &&
+          (start.current() == ' ' || start.obj->isFloatingOrPositioned())))) {
         if( start.obj->isFloatingOrPositioned() ) {
             RenderObject *o = start.obj;
             // add to special objects...
@@ -1567,7 +1562,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
                 // item, then this is all moot. -dwh
                 RenderObject* next = Bidinext( start.par, o );
                 if (!m_pre && next && next->isText() && static_cast<RenderText*>(next)->stringLength() > 0 &&
-                      (static_cast<RenderText*>(next)->text()[0].direction() == QChar::DirWS ||
+                      (static_cast<RenderText*>(next)->text()[0].unicode() == ' ' ||
                       static_cast<RenderText*>(next)->text()[0] == '\n')) {
                     currentCharacterIsSpace = true;
                     ignoringSpaces = true;
@@ -1746,7 +1741,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
                     int strlen = nextText->stringLength();
                     QChar *str = nextText->text();
                     if (strlen &&
-                        ((str[0].direction() == QChar::DirWS) ||
+                        ((str[0].unicode() == ' ') ||
                             (next->style()->whiteSpace() != PRE && str[0] == '\n')))
                         // If the next item on the line is text, and if we did not end with
                         // a space, then the next text run continues our word (and so it needs to

-- 
WebKit Debian packaging