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

sullivan sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:17:49 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 550da92726897dea55a91ad7d5d3257fa7b39516
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 10 17:21:22 2002 +0000

    	Fixed leaks in History mechanism, found by overriding
    	release, retain, autorelease, and dealloc and watching
    	the spam fly.
    
    	* History.subproj/IFWebHistoryPrivate.m:
    	(-[IFWebHistoryPrivate addEntry:]): Make autoreleased array for
    	entries on a given date.
    	(-[IFWebHistoryPrivate _loadHistoryGuts:]): autorelease entries
    	as they are generated from data on disk.
    
    	Added workaround for NSOutlineView leak, by collapsing items
    	just before removing them from the history view.
    
    	* GlobalHistory.m:
    	(-[GlobalHistory removeSelectedItems:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1324 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 22b34e4..5c8d5cb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-06-10  John Sullivan  <sullivan at apple.com>
+
+	Fixed leaks in History mechanism, found by overriding
+	release, retain, autorelease, and dealloc and watching
+	the spam fly.
+
+	* History.subproj/IFWebHistoryPrivate.m:
+	(-[IFWebHistoryPrivate addEntry:]): Make autoreleased array for
+	entries on a given date.
+	(-[IFWebHistoryPrivate _loadHistoryGuts:]): autorelease entries
+	as they are generated from data on disk.
+
 2002-06-10  Darin Adler  <darin at apple.com>
 
 	* WebCoreSupport.subproj/IFTextRenderer.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 22b34e4..5c8d5cb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-06-10  John Sullivan  <sullivan at apple.com>
+
+	Fixed leaks in History mechanism, found by overriding
+	release, retain, autorelease, and dealloc and watching
+	the spam fly.
+
+	* History.subproj/IFWebHistoryPrivate.m:
+	(-[IFWebHistoryPrivate addEntry:]): Make autoreleased array for
+	entries on a given date.
+	(-[IFWebHistoryPrivate _loadHistoryGuts:]): autorelease entries
+	as they are generated from data on disk.
+
 2002-06-10  Darin Adler  <darin at apple.com>
 
 	* WebCoreSupport.subproj/IFTextRenderer.m:
diff --git a/WebKit/History.subproj/IFWebHistoryPrivate.m b/WebKit/History.subproj/IFWebHistoryPrivate.m
index c25547a..2645024 100644
--- a/WebKit/History.subproj/IFWebHistoryPrivate.m
+++ b/WebKit/History.subproj/IFWebHistoryPrivate.m
@@ -149,7 +149,7 @@
     } else {
         // no other entries exist for this date
         [_datesWithEntries insertObject: [entry lastVisitedDate] atIndex: dateIndex];
-        [_entriesByDate insertObject: [[NSMutableArray alloc] initWithObjects: entry, nil] atIndex: dateIndex];
+        [_entriesByDate insertObject: [NSMutableArray arrayWithObject:entry] atIndex: dateIndex];
     }
 
     [_urlDictionary setObject: entry forKey: urlString];
@@ -393,7 +393,7 @@
     while ((dictionary = [enumerator nextObject]) != nil) {
         IFURIEntry *entry;
 
-        entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary];
+        entry = [[[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary] autorelease];
 
         if ([entry url] == nil) {
             // entry without url is useless; data on disk must have been bad; ignore this one
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index c25547a..2645024 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -149,7 +149,7 @@
     } else {
         // no other entries exist for this date
         [_datesWithEntries insertObject: [entry lastVisitedDate] atIndex: dateIndex];
-        [_entriesByDate insertObject: [[NSMutableArray alloc] initWithObjects: entry, nil] atIndex: dateIndex];
+        [_entriesByDate insertObject: [NSMutableArray arrayWithObject:entry] atIndex: dateIndex];
     }
 
     [_urlDictionary setObject: entry forKey: urlString];
@@ -393,7 +393,7 @@
     while ((dictionary = [enumerator nextObject]) != nil) {
         IFURIEntry *entry;
 
-        entry = [[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary];
+        entry = [[[IFURIEntry alloc] initFromDictionaryRepresentation: dictionary] autorelease];
 
         if ([entry url] == nil) {
             // entry without url is useless; data on disk must have been bad; ignore this one

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list