[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 98ecd106410208f7a755713eff6531810304255d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 8 20:34:26 2004 +0000

    	Fix for 3608430 and 3608462, crashes in findNextLineBreak when deleting.  Make sure that the removal of line boxes
    	always checks the previous root line box's line break information and dirties the line if it is pointing
    	to the deleted object.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_line.cpp:
            (InlineFlowBox::removeChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 609d28e..75a1e67 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-04-08  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3608430 and 3608462, crashes in findNextLineBreak when deleting.  Make sure that the removal of line boxes
+	always checks the previous root line box's line break information and dirties the line if it is pointing
+	to the deleted object.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_line.cpp:
+        (InlineFlowBox::removeChild):
+
 2004-04-08  Chris Blumenberg  <cblu at apple.com>
 
 	Removed DOMExtensions.h from DOM.h until it is public.
diff --git a/WebCore/khtml/rendering/render_line.cpp b/WebCore/khtml/rendering/render_line.cpp
index 63fc074..c7ebab8 100644
--- a/WebCore/khtml/rendering/render_line.cpp
+++ b/WebCore/khtml/rendering/render_line.cpp
@@ -204,8 +204,7 @@ void InlineFlowBox::removeChild(InlineBox* child)
     if (!m_dirty)
         dirtyLineBoxes();
 
-    if (!child->nextOnLineExists())
-        child->root()->childRemoved(child);
+    root()->childRemoved(child);
 
     if (child == m_firstChild)
         m_firstChild = child->nextOnLine();

-- 
WebKit Debian packaging