[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 54b6400bd942062817c4c5218b9936ded052f714
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 2 02:59:02 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3182103 - REGRESSION: one developer.apple.com page is so slow, it almost seems like a hang
    
            * khtml/rendering/bidi.cpp:
    	(RenderBlock::findNextLineBreak): Avoid returning bad iterators
    	that point past the end of an object instead of to the start ot
    	the next one.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3994 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e099e8a..3dccbef 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-04-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3182103 - REGRESSION: one developer.apple.com page is so slow, it almost seems like a hang 
+	
+        * khtml/rendering/bidi.cpp:
+	(RenderBlock::findNextLineBreak): Avoid returning bad iterators
+	that point past the end of an object instead of to the start ot
+	the next one.
+
 2003-04-01  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e099e8a..3dccbef 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-04-01  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3182103 - REGRESSION: one developer.apple.com page is so slow, it almost seems like a hang 
+	
+        * khtml/rendering/bidi.cpp:
+	(RenderBlock::findNextLineBreak): Avoid returning bad iterators
+	that point past the end of an object instead of to the start ot
+	the next one.
+
 2003-04-01  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 6cd4aaf..3a03b1c 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1850,6 +1850,15 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start)
         }
     }
 
+    // We might have made lBreak an iterator that points past the end
+    // of the object. Do this adjustment to make it point to the start
+    // of the next object instead to avoid confusing the rest of the
+    // code.
+    if (lBreak.pos > 0) {
+	lBreak.pos--;
+	++lBreak;
+    }
+
     return lBreak;
 }
 

-- 
WebKit Debian packaging