[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 2617943949048447fb0b86cf4a66acbfbeb88d53
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 17 01:57:27 2002 +0000

    	Fix more edge cases with whitespace handling that caused some
    	lines to be too long (and unselectable).
    
            * khtml/rendering/bidi.cpp:
            (appendRunsForObject):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2711 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c068656..b35b464 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Fix more edge cases with whitespace handling that caused some
+	lines to be too long (and unselectable).
+	
+        * khtml/rendering/bidi.cpp:
+        (appendRunsForObject):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Make <caption> error-handling more robust.
 
 	Specifically, handle <tr> and <td> misplaced inside
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c068656..b35b464 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Fix more edge cases with whitespace handling that caused some
+	lines to be too long (and unselectable).
+	
+        * khtml/rendering/bidi.cpp:
+        (appendRunsForObject):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Make <caption> error-handling more robust.
 
 	Specifically, handle <tr> and <td> misplaced inside
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c068656..b35b464 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Fix more edge cases with whitespace handling that caused some
+	lines to be too long (and unselectable).
+	
+        * khtml/rendering/bidi.cpp:
+        (appendRunsForObject):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Make <caption> error-handling more robust.
 
 	Specifically, handle <tr> and <td> misplaced inside
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index c3e1f27..26a7965 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -274,11 +274,15 @@ static void appendRunsForObject(int start, int end, RenderObject* obj)
         
         // An end midpoint has been encounted within our object.  We
         // need to go ahead and append a run with our endpoint.
-        sruns->append( new BidiRun(start, nextMidpoint->pos+1, obj, context, dir) );
-        betweenMidpoints = true;
-        int nextPos = nextMidpoint->pos+1;
-        smidpoints->removeFirst();
-        return appendRunsForObject(nextPos, end, obj);
+        if (int(nextMidpoint->pos+1) <= end) {
+            sruns->append( new BidiRun(start, nextMidpoint->pos+1, obj, context, dir) );
+            betweenMidpoints = true;
+            int nextPos = nextMidpoint->pos+1;
+            smidpoints->removeFirst();
+            return appendRunsForObject(nextPos, end, obj);
+        }
+        else
+            sruns->append( new BidiRun(start, end, obj, context, dir) );
     }
 }
 

-- 
WebKit Debian packaging