[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 d0d75181bfc9b5da2dad2b6d3f2b6c458fede87d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 9 19:02:45 2004 +0000

    	Fix for 3608445, garbage characters rendered after doing delete.  Delta was unsigned when it was supposed to
    	be signed, since deletion involves a negative delta.  Also had an off-by-one error in the line break end check.
    
            Reviewed by john
    
            * khtml/rendering/render_text.cpp:
            (RenderText::setTextWithOffset):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6344 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 414046b..ff3f9df 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-09  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3608445, garbage characters rendered after doing delete.  Delta was unsigned when it was supposed to
+	be signed, since deletion involves a negative delta.  Also had an off-by-one error in the line break end check.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_text.cpp:
+        (RenderText::setTextWithOffset):
+
 2004-04-09  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 021008b..fdb31d7 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -1191,7 +1191,7 @@ void RenderText::setTextWithOffset(DOMStringImpl *text, uint offset, uint len, b
 {
     uint oldLen = str ? str->l : 0;
     uint newLen = text ? text->l : 0;
-    uint delta = newLen - oldLen;
+    int delta = newLen - oldLen;
     uint end = len ? offset+len-1 : offset;
 
     RootInlineBox* firstRootBox = 0;
@@ -1242,7 +1242,7 @@ void RenderText::setTextWithOffset(DOMStringImpl *text, uint offset, uint len, b
             firstRootBox = prev;
     }
     for (RootInlineBox* curr = firstRootBox; curr && curr != lastRootBox; curr = curr->nextRootBox()) {
-        if (curr->lineBreakObj() == this && curr->lineBreakPos() >= end)
+        if (!curr->isDirty() && curr->lineBreakObj() == this && curr->lineBreakPos() > end)
             curr->setLineBreakPos(curr->lineBreakPos()+delta);
     }
     

-- 
WebKit Debian packaging