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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit e0bbfba7f30718f5a3a05245ffc0346a83a1a10a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 20:00:48 2004 +0000

    	Fixed: <rdar://problem/3575598>: REGRESSION: Safari crashes at IS&T website
    
            Reviewed by darin.
    
            * WebView.subproj/WebDataSource.m:
            (-[WebDataSourcePrivate dealloc]): don't stop the icon loader here because that can cause an infinite loop
            (-[WebDataSource _stopLoadingInternal]): always stop the icon loader here instead of just when the data source is loading as well.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6155 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 51692e1..e520211 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-02  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3575598>: REGRESSION: Safari crashes at IS&T website
+
+        Reviewed by darin.
+
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSourcePrivate dealloc]): don't stop the icon loader here because that can cause an infinite loop
+        (-[WebDataSource _stopLoadingInternal]): always stop the icon loader here instead of just when the data source is loading as well.
+
 === Safari-130 ===
 
 2004-03-02  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index b4028c5..94ab50a 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -48,9 +48,6 @@
     // The WebView is only retained while loading, but this object is also
     // retained while loading, so no need to release here
     ASSERT(!loading);
-    
-    // FIXME: We don't know why this is needed, but without it we leak icon loaders.
-    [iconLoader stopLoading];
 
     [resourceData release];
     [representation release];
@@ -309,6 +306,10 @@
 
 - (void)_stopLoadingInternal
 {
+    // Always attempt to stop the icon loader because it may still be loading after the data source
+    // is done loading and not stopping it can cause a world leak.
+    [_private->iconLoader stopLoading];
+
     if (!_private->loading) {
 	return;
     }
@@ -333,8 +334,6 @@
     if (_private->committed) {
 	[[self _bridge] closeURL];        
     }
-
-    [_private->iconLoader stopLoading];
 }
 
 - (void)_recursiveStopLoading

-- 
WebKit Debian packaging