Reviewed by Darin.
authorthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Aug 2006 19:56:53 +0000 (19:56 +0000)
committerthatcher <thatcher@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Aug 2006 19:56:53 +0000 (19:56 +0000)
        Fix for Mail stationary. Selecting a stationary item would cause this exception.
        *** -[WebSubresourceLoader copyWithZone:]: selector not recognized
        Uncaught exception - *** -[WebSubresourceLoader copyWithZone:]: selector not recognized

        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader willUseArchiveForRequest:originalURL:loader:]):
        Use _webkit_setObject:forUncopiedKey: when addign the resource to pendingArchivedResources.

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

WebKit/ChangeLog
WebKit/Loader/WebFrameLoader.m

index b2b34cc..e1f08f1 100644 (file)
@@ -1,3 +1,15 @@
+2006-08-24  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        Fix for Mail stationary. Selecting a stationary item would cause this exception.
+        *** -[WebSubresourceLoader copyWithZone:]: selector not recognized
+        Uncaught exception - *** -[WebSubresourceLoader copyWithZone:]: selector not recognized
+
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader willUseArchiveForRequest:originalURL:loader:]):
+        Use _webkit_setObject:forUncopiedKey: when addign the resource to pendingArchivedResources.
+
 2006-08-23  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Adele.
index 34b0f0e..1c32e3a 100644 (file)
@@ -45,6 +45,7 @@
 #import <WebKit/WebFrameLoadDelegate.h>
 #import <WebKit/WebDataProtocol.h>
 #import <WebKit/WebKitNSStringExtras.h>
+#import "WebNSDictionaryExtras.h"
 
 @implementation WebFrameLoader
 
@@ -644,7 +645,7 @@ static BOOL isCaseInsensitiveEqual(NSString *a, NSString *b)
     if ([[r URL] isEqual:originalURL] && [self _canUseResourceForRequest:r]) {
         WebResource *resource = [self _archivedSubresourceForURL:originalURL];
         if (resource && [self _canUseResourceWithResponse:[resource _response]]) {
-            [[self pendingArchivedResources] setObject:resource forKey:loader];
+            [[self pendingArchivedResources] _webkit_setObject:resource forUncopiedKey:loader];
             // Deliver the resource after a delay because callers don't expect to receive callbacks while calling this method.
             [self deliverArchivedResourcesAfterDelay];
             return YES;