[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 48710d6d6bfa0c2e643b674f925c62dc004adcd2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 21 09:17:13 2003 +0000

    	Fix for 3384635, breakable unicode characters that were preceded by multiple spaces
    	accidentally added in those spaces to their widths.
    
            Reviewed by rjw and gramps
    
            * khtml/rendering/bidi.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a0373bf..57cb0a6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-08-21  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3384635, breakable unicode characters that were preceded by multiple spaces
+	accidentally added in those spaces to their widths.
+	
+        Reviewed by rjw and gramps
+
+        * khtml/rendering/bidi.cpp:
+
 2003-08-20  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3384609.  Objects that want to dodge floats should fill the line width instead
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a0373bf..57cb0a6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-08-21  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3384635, breakable unicode characters that were preceded by multiple spaces
+	accidentally added in those spaces to their widths.
+	
+        Reviewed by rjw and gramps
+
+        * khtml/rendering/bidi.cpp:
+
 2003-08-20  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3384609.  Objects that want to dodge floats should fill the line width instead
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 2d20f99..3fff66e 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1610,9 +1610,11 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
                         if (!currentCharacterIsSpace) {
                             // Stop ignoring spaces and begin at this
                             // new point.
+                            ignoringSpaces = false;
+                            lastSpacePos = 0;
+                            lastSpace = pos; // e.g., "Foo    goo", don't add in any of the ignored spaces.
                             BidiIterator startMid = { 0, o, pos };
                             addMidpoint(startMid);
-                            ignoringSpaces = false;
                         }
                         else {
                             // Just keep ignoring these spaces.

-- 
WebKit Debian packaging