Reviewed by John.
authorbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jul 2006 18:39:46 +0000 (18:39 +0000)
committerbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jul 2006 18:39:46 +0000 (18:39 +0000)
        Small fix to my previous small fix that only lets the ASSERT off the hook if the DB
        is closing

        * Misc/WebIconDatabase.m:
        (-[WebIconDatabase _releaseIconForIconURLString:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/Misc/WebIconDatabase.m

index 2ff5d3862e5b42e485b554181e0bfe0feea6d48b..d7dcbbf6dd511bfd86d6bd33aa86ae38bf8da33f 100644 (file)
@@ -1,3 +1,13 @@
+2006-07-06  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by John.
+
+        Small fix to my previous small fix that only lets the ASSERT off the hook if the DB
+        is closing
+
+        * Misc/WebIconDatabase.m:
+        (-[WebIconDatabase _releaseIconForIconURLString:]):
+
 2006-07-05  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Maciej
index efd1af4ef6509e325dc7013f42b00a8231a2b20f..7ff7aff178696ce860b7090c0ca22ddbd48269b6 100644 (file)
@@ -821,12 +821,12 @@ NSSize WebIconLargeSize = {128, 128};
 {
     ASSERT(iconURLString);
     
-    if (![self _isEnabled] || _isClosing)
+    if (![self _isEnabled])
         return;
     
     WebNSUInteger retainCount = (WebNSUInteger)(void *)CFDictionaryGetValue(_private->iconURLToExtraRetainCount, iconURLString);
 
-    ASSERT(retainCount > 0);
+    ASSERT(_isClosing || retainCount > 0);
     if (retainCount <= 0)
         return;