[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 4d497e95d336e14691dd4e9640feb7a7e45ace4d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 4 00:50:04 2003 +0000

            Reviewed by Chris.
    
    	- fixed leak of WebIconLoader observed using leaks tool
    
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSourcePrivate dealloc]): Tell the icon loader to stop loading.
    	Add a FIXME asking why we had to do this to fix the leak.
            (-[WebDataSource _loadIcon]): Add an assertion.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3249 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d541e20..9287b59 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-03  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+	- fixed leak of WebIconLoader observed using leaks tool
+
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSourcePrivate dealloc]): Tell the icon loader to stop loading.
+	Add a FIXME asking why we had to do this to fix the leak.
+        (-[WebDataSource _loadIcon]): Add an assertion.
+
 2003-01-03  Richard Williamson   <rjw at apple.com>
 
         Fix to 3131226.  Don't force a layout when the document view is set 
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 15922ba..c88e6d5 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -48,7 +48,10 @@
     ASSERT(!loading);
     
     [pluginController dataSourceWillBeDeallocated];
-    
+
+    // FIXME: We don't know why this is needed, but without it we leak icon loaders.
+    [iconLoader stopLoading];
+
     [resourceData release];
     [representation release];
     [request release];
@@ -556,6 +559,7 @@
         if([[WebIconDatabase sharedIconDatabase] _hasIconForIconURL:[_private->iconURL absoluteString]]){
             [self _updateIconDatabaseWithURL:_private->iconURL];
         }else{
+            ASSERT(!_private->iconLoader);
             _private->iconLoader = [[WebIconLoader alloc] initWithURL:_private->iconURL];
             [_private->iconLoader setDelegate:self];
             [_private->iconLoader startLoading];

-- 
WebKit Debian packaging