[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 5fc030cffdb08236b26c63506de5217bfd487b80
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat May 18 01:35:23 2002 +0000

    	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
    	OK. This time it's correct.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1174 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8ee3d4a..9f63399 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,6 +1,11 @@
 2002-05-17  Darin Adler  <darin at apple.com>
 
 	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
+	OK. This time it's correct.
+
+2002-05-17  Darin Adler  <darin at apple.com>
+
+	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
 	Roll the change out while I see why it causes a crash.
 
 prim2002-05-17  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8ee3d4a..9f63399 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,6 +1,11 @@
 2002-05-17  Darin Adler  <darin at apple.com>
 
 	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
+	OK. This time it's correct.
+
+2002-05-17  Darin Adler  <darin at apple.com>
+
+	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
 	Roll the change out while I see why it causes a crash.
 
 prim2002-05-17  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8ee3d4a..9f63399 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,6 +1,11 @@
 2002-05-17  Darin Adler  <darin at apple.com>
 
 	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
+	OK. This time it's correct.
+
+2002-05-17  Darin Adler  <darin at apple.com>
+
+	* khtml/rendering/render_list.cpp: (RenderListItem::setStyle):
 	Roll the change out while I see why it causes a crash.
 
 prim2002-05-17  Darin Adler  <darin at apple.com>
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index 918ef6b..855d42c 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -128,6 +128,11 @@ void RenderListItem::setStyle(RenderStyle *_style)
     RenderFlow::setStyle(_style);
 
     RenderStyle *newStyle = new RenderStyle();
+    
+#ifdef APPLE_CHANGES
+    newStyle->ref();
+#endif
+    
     newStyle->inheritFrom(style());
     if(newStyle->direction() == LTR)
         newStyle->setFloating(FLEFT);
@@ -148,7 +153,7 @@ void RenderListItem::setStyle(RenderStyle *_style)
     }
 
 #ifdef APPLE_CHANGES
-    //newStyle->deref();
+    newStyle->deref();
 #endif
 }
 

-- 
WebKit Debian packaging