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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:12:36 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 527e5be4f24ec0fe492c0f9112e2939fc972a8ad
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 14 06:16:03 2002 +0000

    	* kwq/KWQListImpl.mm: (KWQListImpl::~KWQListImpl): Detach all the iterators from
    	the list when the list is destroyed. I thought this was done before, but it seems not.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1143 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 05b9826..714659a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-05-13  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQListImpl.mm: (KWQListImpl::~KWQListImpl): Detach all the iterators from
+	the list when the list is destroyed. I thought this was done before, but it seems not.
+
+2002-05-13  Darin Adler  <darin at apple.com>
+
 	Fixed bug 2922884 (JavaScript object leak creating Image object from JavaScript).
 	There was a reference loop created when a document contained a variable that
 	referenced an image, because images held references to the document; the C++
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 05b9826..714659a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-05-13  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQListImpl.mm: (KWQListImpl::~KWQListImpl): Detach all the iterators from
+	the list when the list is destroyed. I thought this was done before, but it seems not.
+
+2002-05-13  Darin Adler  <darin at apple.com>
+
 	Fixed bug 2922884 (JavaScript object leak creating Image object from JavaScript).
 	There was a reference loop created when a document contained a variable that
 	referenced an image, because images held references to the document; the C++
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 05b9826..714659a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-05-13  Darin Adler  <darin at apple.com>
 
+	* kwq/KWQListImpl.mm: (KWQListImpl::~KWQListImpl): Detach all the iterators from
+	the list when the list is destroyed. I thought this was done before, but it seems not.
+
+2002-05-13  Darin Adler  <darin at apple.com>
+
 	Fixed bug 2922884 (JavaScript object leak creating Image object from JavaScript).
 	There was a reference loop created when a document contained a variable that
 	referenced an image, because images held references to the document; the C++
diff --git a/WebCore/kwq/KWQListImpl.mm b/WebCore/kwq/KWQListImpl.mm
index dae86c0..09872e4 100644
--- a/WebCore/kwq/KWQListImpl.mm
+++ b/WebCore/kwq/KWQListImpl.mm
@@ -25,10 +25,7 @@
 
 #include <KWQListImpl.h>
 
-#ifndef USING_BORROWED_QLIST
-
 #include <cstddef>
-
 #include <CoreFoundation/CFArray.h>
 
 // KWQListNode
@@ -159,6 +156,11 @@ KWQListImpl::KWQListImpl(const KWQListImpl &impl) :
 
 KWQListImpl::~KWQListImpl()
 {
+    for (KWQListNode *iterator = d->iterators; iterator != NULL; iterator = iterator->next) {
+	KWQListIteratorImpl::KWQListIteratorPrivate *p = ((KWQListIteratorImpl *)iterator->data)->d;
+        p->node = 0;
+	p->list = 0;
+    }
     delete d;
 }
      
@@ -661,5 +663,3 @@ KWQListIteratorImpl &KWQListIteratorImpl::operator=(const KWQListIteratorImpl &i
 
     return *this;
 }
-
-#endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list