[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 9e37b0c8af489954db2056c307305a6b47dd8824
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 17 17:57:14 2002 +0000

    	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
    	Remove an old incorrect fix for a style leak in here and put in
    	a new correct fix.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1169 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 396d5ae..4b0be71 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+prim2002-05-17  Darin Adler  <darin at apple.com>
+
+	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
+	Remove an old incorrect fix for a style leak in here and put in
+	a new correct fix.
+
 2002-05-16  Richard J. Williamson  <rjw at apple.com>
 
 	Fixed 2896350.  Ignore DPI in images and render directly at pixel size.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 396d5ae..4b0be71 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+prim2002-05-17  Darin Adler  <darin at apple.com>
+
+	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
+	Remove an old incorrect fix for a style leak in here and put in
+	a new correct fix.
+
 2002-05-16  Richard J. Williamson  <rjw at apple.com>
 
 	Fixed 2896350.  Ignore DPI in images and render directly at pixel size.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 396d5ae..4b0be71 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+prim2002-05-17  Darin Adler  <darin at apple.com>
+
+	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
+	Remove an old incorrect fix for a style leak in here and put in
+	a new correct fix.
+
 2002-05-16  Richard J. Williamson  <rjw at apple.com>
 
 	Fixed 2896350.  Ignore DPI in images and render directly at pixel size.
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index 8dd0912..8bdac81 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -142,13 +142,14 @@ void RenderListItem::setStyle(RenderStyle *_style)
     } else if ( m_marker && style()->listStyleType() == LNONE) {
         m_marker->detach();
         m_marker = 0;
-#ifdef APPLE_CHANGES
-        delete newStyle;
-#endif
     }
     else if ( m_marker ) {
         m_marker->setStyle(newStyle);
     }
+
+#ifdef APPLE_CHANGES
+    newStyle->deref();
+#endif
 }
 
 RenderListItem::~RenderListItem()

-- 
WebKit Debian packaging