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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 5615a1298cccb3dd3c9c40b19f6973b22adc7d77
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 21:50:53 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3705500> REGRESSION (125.8-146): Cmd-E on an
            HTML page puts a trailing space on Find pasteboard
    
            * khtml/misc/khtml_text_operations.cpp:
            (khtml::TextIterator::handleTextBox):
            In the case where a subrun doesn't extend to the end of the text box,
            the well-commented code was supposed to return from this routine, but
            the wrong variable was being compared. This would send us through another
            pass of the loop, which would end up worrying about collapsed space at the
            end of the current box, even though we only cared about the beginning of the
            current box.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7016 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 86920d4..3b28910 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2004-07-13  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Ken.
+        
+        - fixed <rdar://problem/3705500> REGRESSION (125.8-146): Cmd-E on an 
+        HTML page puts a trailing space on Find pasteboard
+
+        * khtml/misc/khtml_text_operations.cpp:
+        (khtml::TextIterator::handleTextBox):
+        In the case where a subrun doesn't extend to the end of the text box,
+        the well-commented code was supposed to return from this routine, but
+        the wrong variable was being compared. This would send us through another
+        pass of the loop, which would end up worrying about collapsed space at the
+        end of the current box, even though we only cared about the beginning of the
+        current box.
+
 2004-07-12  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3717982.  Implemented navigator.language!
diff --git a/WebCore/khtml/editing/visible_text.cpp b/WebCore/khtml/editing/visible_text.cpp
index ba2688a..8f233ee 100644
--- a/WebCore/khtml/editing/visible_text.cpp
+++ b/WebCore/khtml/editing/visible_text.cpp
@@ -384,7 +384,7 @@ void TextIterator::handleTextBox()
 
             // If we are doing a subrun that doesn't go to the end of the text box,
             // come back again to finish handling this text box; don't advance to the next one.
-            if (m_positionEndOffset < runEnd) {
+            if (m_positionEndOffset < textBoxEnd) {
                 return;
             }
 
diff --git a/WebCore/khtml/misc/khtml_text_operations.cpp b/WebCore/khtml/misc/khtml_text_operations.cpp
index ba2688a..8f233ee 100644
--- a/WebCore/khtml/misc/khtml_text_operations.cpp
+++ b/WebCore/khtml/misc/khtml_text_operations.cpp
@@ -384,7 +384,7 @@ void TextIterator::handleTextBox()
 
             // If we are doing a subrun that doesn't go to the end of the text box,
             // come back again to finish handling this text box; don't advance to the next one.
-            if (m_positionEndOffset < runEnd) {
+            if (m_positionEndOffset < textBoxEnd) {
                 return;
             }
 

-- 
WebKit Debian packaging