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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 852d80b26d75089f622ee7cc770e4dea9c57e686
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 14 21:46:15 2002 +0000

            Fixed 3099505.  With the recent white space changes, multiple slaves may
            be created for contiguous text on the same line.  The fix changes the
            iteration order of over the slave array.  Now, when searching for the end
            point of a line we'll always find the last slave on a line first.
    
            * khtml/khtml_part.cpp:
            (lastSlaveAt):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2679 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 884dd58..019de1e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-11-14  Richard Williamson  <rjw at apple.com>
+
+        Fixed 3099505.  With the recent white space changes, multiple slaves may
+        be created for contiguous text on the same line.  The fix changes the
+        iteration order of over the slave array.  Now, when searching for the end
+        point of a line we'll always find the last slave on a line first.
+        
+        * khtml/khtml_part.cpp:
+        (lastSlaveAt):
+
 2002-11-14  Darin Adler  <darin at apple.com>
 
 	- fixed 3095854 -- small select boxes get no scrollbar
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 884dd58..019de1e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-11-14  Richard Williamson  <rjw at apple.com>
+
+        Fixed 3099505.  With the recent white space changes, multiple slaves may
+        be created for contiguous text on the same line.  The fix changes the
+        iteration order of over the slave array.  Now, when searching for the end
+        point of a line we'll always find the last slave on a line first.
+        
+        * khtml/khtml_part.cpp:
+        (lastSlaveAt):
+
 2002-11-14  Darin Adler  <darin at apple.com>
 
 	- fixed 3095854 -- small select boxes get no scrollbar
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 884dd58..019de1e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-11-14  Richard Williamson  <rjw at apple.com>
+
+        Fixed 3099505.  With the recent white space changes, multiple slaves may
+        be created for contiguous text on the same line.  The fix changes the
+        iteration order of over the slave array.  Now, when searching for the end
+        point of a line we'll always find the last slave on a line first.
+        
+        * khtml/khtml_part.cpp:
+        (lastSlaveAt):
+
 2002-11-14  Darin Adler  <darin at apple.com>
 
 	- fixed 3095854 -- small select boxes get no scrollbar
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 01d392f..8cb2d79 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -4015,7 +4015,7 @@ static bool lastSlaveAt (khtml::RenderObject *renderNode, int y, DOM::NodeImpl*&
     if (renderNode->isText()){
         khtml::RenderText *textRenderer =  static_cast<khtml::RenderText *>(renderNode);
         khtml::TextSlaveArray slaves = textRenderer->textSlaves();
-        for (int i = 0; i < (int)slaves.count(); i++){
+        for (int i = (int)slaves.count()-1; i >= 0; i--){
             if (slaves[i]->m_y == y){
                 endNode = textRenderer->element();
                 endOffset = slaves[i]->m_start + slaves[i]->m_len;

-- 
WebKit Debian packaging