[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 72ef5486569980c8c3e78caeaac40416e79b3a29
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 11 01:44:55 2004 +0000

    	Fix crasher in list code caused by incorrect style deallocation.  Regression from the
    	arena changes for RenderStyles.
    
            Reviewed by darin
    
            * khtml/rendering/render_object.cpp:
            (RenderObject::remove):
            (RenderObject::arenaDelete):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6062 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3f3ff2d..e709b30 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2004-02-10  David Hyatt  <hyatt at apple.com>
 
+	Fix crasher in list code caused by incorrect style deallocation.  Regression from the
+	arena changes for RenderStyles.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_object.cpp:
+        (RenderObject::remove):
+        (RenderObject::arenaDelete):
+
+2004-02-10  David Hyatt  <hyatt at apple.com>
+
 	Fix for osnews.com's wacky layout problem.  Put back in the check for isEmpty.
 	
         Reviewed by darin
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 46be85b..645dc9a 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -1676,12 +1676,6 @@ void RenderObject::remove()
     if (parent())
         //have parent, take care of the tree integrity
         parent()->removeChild(this);
-
-    if (m_style->backgroundImage())
-        m_style->backgroundImage()->deref(this);
-    if (m_style)
-        m_style->deref(renderArena());
-    m_style = 0;
 }
 
 void RenderObject::detach()
@@ -1694,6 +1688,11 @@ void RenderObject::detach()
 
 void RenderObject::arenaDelete(RenderArena *arena, void *base)
 {
+    if (m_style->backgroundImage())
+        m_style->backgroundImage()->deref(this);
+    if (m_style)
+        m_style->deref(arena);
+    
 #ifndef NDEBUG
     void *savedBase = baseOfRenderObjectBeingDeleted;
     baseOfRenderObjectBeingDeleted = base;

-- 
WebKit Debian packaging