[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 e4af6ab3119bb6f37c1f72f6a20b017963639670
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 21 20:10:42 2003 +0000

    	These problems:
    	3184359 - icon exception closing window while typing
    	3245476 - Safari-78 crashes or hangs after IMDB Find and using the history menu to go back ...
    	are not or are no longer reproducible. They were caused by an exception raised in WebKit.
    	Since we don't use exceptions in WebKit, I've replaced the exception with an assert.
    
    	Reviewed by john.
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _releaseFutureIconForURL:]): assert instead of exception if failure
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4406 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 586034a..aa5106b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-05-21  Chris Blumenberg  <cblu at apple.com>
+
+	These problems:
+	3184359 - icon exception closing window while typing
+	3245476 - Safari-78 crashes or hangs after IMDB Find and using the history menu to go back ...
+	are not or are no longer reproducible. They were caused by an exception raised in WebKit.
+	Since we don't use exceptions in WebKit, I've replaced the exception with an assert.
+		
+	Reviewed by john.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _releaseFutureIconForURL:]): assert instead of exception if failure
+
 2003-05-21  Ed Voas <voas at apple.com> 
 
 	- fixed 3262868: Update Carbon WebKit API prefixes
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 47b92bb..ff09d25 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -540,7 +540,7 @@ NSSize WebIconLargeSize = {128, 128};
     NSNumber *retainCount = [_private->iconURLToRetainCount objectForKey:iconURLString];
 
     if (!retainCount) {
-        ERROR("Tried to release a non-retained icon: %@", iconURLString);
+        ASSERT_NOT_REACHED();
         return;
     }
     
@@ -594,9 +594,8 @@ NSSize WebIconLargeSize = {128, 128};
     
     NSNumber *retainCount = [_private->futureURLToRetainCount objectForKey:URL];
 
-    if(!retainCount){
-        [NSException raise:NSGenericException
-                    format:@"Releasing a future icon that was not previously retained."];
+    if (!retainCount) {
+        ASSERT_NOT_REACHED();
         return;
     }
 

-- 
WebKit Debian packaging