Changed type for identifier parameter in WebResourceLoadDelegate-related calls to...

[WebKit-https.git] / WebKit / WebView.subproj / WebFrame.m

diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 94aa82f14cde51f36a3b416b5acc7e483e0e08ff..af361afd70f44274e6a2fd815e0b95093e3439f1 100644 (file)
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -1055,7 +1055,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
             response = [responses objectAtIndex: i];
             // FIXME: If the WebKit client changes or cancels the request, this is not respected.
             NSError *error;
-            NSString *identifier;
+            id identifier;
             NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[response URL]];
             [self _requestFromDelegateForRequest:request identifier:&identifier error:&error];
             [self _sendRemainingDelegateMessagesWithIdentifier:identifier response:response length:[response expectedContentLength] error:error];
@@ -2555,7 +2555,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     return _private->internalLoadDelegate;
 }
 
-- (NSURLRequest *)_requestFromDelegateForRequest:(NSURLRequest *)request identifier:(NSString **)identifier error:(NSError **)error
+- (NSURLRequest *)_requestFromDelegateForRequest:(NSURLRequest *)request identifier:(id *)identifier error:(NSError **)error
 {
     ASSERT(request != nil);
     
@@ -2587,7 +2587,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     return newRequest;
 }
 
-- (void)_sendRemainingDelegateMessagesWithIdentifier:(NSString *)identifier response:(NSURLResponse *)response length:(unsigned)length error:(NSError *)error 
+- (void)_sendRemainingDelegateMessagesWithIdentifier:(id)identifier response:(NSURLResponse *)response length:(unsigned)length error:(NSError *)error 
 {    
     WebView *wv = [self webView];
     id delegate = [wv resourceLoadDelegate];
@@ -2624,7 +2624,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 }
 
 - (void)_saveResourceAndSendRemainingDelegateMessagesWithRequest:(NSURLRequest *)request
-                                                      identifier:(NSString *)identifier 
+                                                      identifier:(id)identifier 
                                                         response:(NSURLResponse *)response 
                                                             data:(NSData *)data
                                                            error:(NSError *)error