[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 3b5c3eef57d32286ee9de1bb4c569d1c5de2e1d4
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 21 00:07:01 2004 +0000

    	Revise the patch for incorrect caret positions when brs get deleted.  It can be even simpler.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::dirtyLinesFromChangedChild):
            * khtml/rendering/render_text.cpp:
            (RenderText::detach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e87771f..a351422 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2004-05-20  David Hyatt  <hyatt at apple.com>
 
+	Revise the patch for incorrect caret positions when brs get deleted.  It can be even simpler.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::dirtyLinesFromChangedChild):
+        * khtml/rendering/render_text.cpp:
+        (RenderText::detach):
+
+2004-05-20  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3629816, caret in wrong position when deleting <br>s on lines by themselves or when moving <br>s
 	on lines by themselves.
 	
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index c04e687..317466e 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -211,7 +211,7 @@ void RenderFlow::dirtyLinesFromChangedChild(RenderObject* child)
     // line box by examining our siblings.  If we didn't find a line box, then use our 
     // parent's first line box.
     RootInlineBox* box = 0;
-    for (RenderObject* curr = child; curr; curr = curr->previousSibling()) {
+    for (RenderObject* curr = child->previousSibling(); curr; curr = curr->previousSibling()) {
         if (curr->isFloatingOrPositioned())
             continue;
         
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 6591977..f57c35e 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -327,11 +327,11 @@ RenderText::~RenderText()
 void RenderText::detach()
 {
     if (!documentBeingDestroyed()) {
-        if (parent() && isBR())
-            parent()->dirtyLinesFromChangedChild(this);
         if (firstTextBox())
             for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox())
                 box->remove();
+        else if (parent() && isBR())
+            parent()->dirtyLinesFromChangedChild(this);
     }
     deleteTextBoxes();
     RenderObject::detach();

-- 
WebKit Debian packaging