[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 f511dc1380bdce9056b96e5fef03ef0873509788
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 13 00:19:14 2003 +0000

    	Fixed: <rdar://problem/3482147>: replace _releaseFutureIconForURL assertion with a log statement
    
            Reviewed by rjw.
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _releaseFutureIconForURL:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5472 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 535c062..bb672c9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-12  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3482147>: replace _releaseFutureIconForURL assertion with a log statement
+
+        Reviewed by rjw.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _releaseFutureIconForURL:]):
+
 2003-11-10  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3478765.  Use ICU to access unicode properties.
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 54342f8..282b829 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -608,7 +608,7 @@ NSSize WebIconLargeSize = {128, 128};
     NSNumber *retainCount = [_private->futureURLToRetainCount objectForKey:URL];
 
     if (!retainCount) {
-        ASSERT_NOT_REACHED();
+        ERROR("The future icon for %@ was released before it was retained.", URL);
         return;
     }
 

-- 
WebKit Debian packaging