[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 d20075d49994f6d05071d60173c425ef44c2924e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 16 02:23:32 2002 +0000

    	Fix the problem where the last lines of paragrpahs were getting
    	justified incorrectly.
    
            * khtml/rendering/bidi.cpp:
            (RenderFlow::findNextLineBreak):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2706 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c5370cc..61179be 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix the problem where the last lines of paragrpahs were getting
+	justified incorrectly.
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Fix bustage with <nobr> tags.  Inline nowrap elements were
 	breaking on images when they shouldn't have.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c5370cc..61179be 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix the problem where the last lines of paragrpahs were getting
+	justified incorrectly.
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Fix bustage with <nobr> tags.  Inline nowrap elements were
 	breaking on images when they shouldn't have.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c5370cc..61179be 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix the problem where the last lines of paragrpahs were getting
+	justified incorrectly.
+	
+        * khtml/rendering/bidi.cpp:
+        (RenderFlow::findNextLineBreak):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Fix bustage with <nobr> tags.  Inline nowrap elements were
 	breaking on images when they shouldn't have.
 	
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index b476eec..c3e1f27 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1437,8 +1437,12 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
         //else if (lBreak.pos > 0)
         //    lBreak.pos--;
         else if (lBreak.obj == 0 && trailingSpaceObject->isText()) {
-            lBreak.obj = trailingSpaceObject;
-            lBreak.pos = static_cast<RenderText *>(trailingSpaceObject)->length() - 1;
+            // Add a new end midpoint that stops right at the very end.
+            BidiIterator* endMid = new (trailingSpaceObject->renderArena()) BidiIterator();
+            endMid->obj = trailingSpaceObject;
+            RenderText* text = static_cast<RenderText *>(trailingSpaceObject);
+            endMid->pos = text->length() >=2 ? text->length() - 2 : 0;
+            midpoints.append(endMid);
         }
     }
     

-- 
WebKit Debian packaging