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

    	Fix for 3629816, caret in wrong position when deleting <br>s on lines by themselves or when moving <br>s
    	on lines by themselves.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::detach):
            * khtml/rendering/render_br.cpp:
            (RenderBR::setPos):
            * khtml/rendering/render_br.h:
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::dirtyLinesFromChangedChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 538eba5..e87771f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+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.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::detach):
+        * khtml/rendering/render_br.cpp:
+        (RenderBR::setPos):
+        * khtml/rendering/render_br.h:
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::dirtyLinesFromChangedChild):
+
 2004-05-20  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 1723f4d..964055f 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -135,6 +135,7 @@ void RenderBox::detach()
         if (!documentBeingDestroyed())
             m_inlineBoxWrapper->remove();
         m_inlineBoxWrapper->detach(arena);
+        m_inlineBoxWrapper = 0;
     }
 
     RenderContainer::detach();
diff --git a/WebCore/khtml/rendering/render_br.cpp b/WebCore/khtml/rendering/render_br.cpp
index 2f993f1..62d908f 100644
--- a/WebCore/khtml/rendering/render_br.cpp
+++ b/WebCore/khtml/rendering/render_br.cpp
@@ -35,6 +35,12 @@ RenderBR::~RenderBR()
 {
 }
 
+void RenderBR::setPos(int xPos, int yPos)
+{
+    m_x = xPos;
+    m_y = yPos;
+}
+
 InlineBox* RenderBR::createInlineBox(bool makePlaceholder, bool isRootLineBox, bool isOnlyRun)
 {
     // We only make a box for a <br> if we are on a line by ourself or in strict mode
diff --git a/WebCore/khtml/rendering/render_br.h b/WebCore/khtml/rendering/render_br.h
index f7a0e9d..077fd2e 100644
--- a/WebCore/khtml/rendering/render_br.h
+++ b/WebCore/khtml/rendering/render_br.h
@@ -60,7 +60,8 @@ public:
     virtual int xPos() const { return m_x; }
     virtual int yPos() const { return m_y; }
     virtual int height() const { return m_height; }
-
+    virtual void setPos(int xPos, int yPos);
+    
     virtual bool isBR() const { return true; }
 
     virtual long caretMinOffset() const;
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 317466e..c04e687 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->previousSibling(); curr; curr = curr->previousSibling()) {
+    for (RenderObject* curr = child; curr; curr = curr->previousSibling()) {
         if (curr->isFloatingOrPositioned())
             continue;
         

-- 
WebKit Debian packaging