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

        Reviewed by kevin.

        * WebCoreSupport.subproj/WebBridge.m:
        (-[WebBridge objectLoadedFromCacheWithURL:response:data:]):
        (-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
        * WebView.subproj/WebFrame.m:
        (-[WebFrame _opened]):
        (-[WebFrame _requestFromDelegateForRequest:identifier:error:]):
        (-[WebFrame _sendRemainingDelegateMessagesWithIdentifier:response:length:error:]):
        (-[WebFrame _saveResourceAndSendRemainingDelegateMessagesWithRequest:identifier:response:data:error:]):
        * WebView.subproj/WebFrameInternal.h:

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 47722dab87469da95e0f7d3b0ab960a38e29607e..534b5e8b1c911c261709d73292b3132a48e5b914 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2005-05-23  Chris Blumenberg  <cblu@apple.com>
+
+       Changed type for identifier parameter in WebResourceLoadDelegate-related calls to id from NSString.
+
+        Reviewed by kevin.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge objectLoadedFromCacheWithURL:response:data:]):
+        (-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _opened]):
+        (-[WebFrame _requestFromDelegateForRequest:identifier:error:]):
+        (-[WebFrame _sendRemainingDelegateMessagesWithIdentifier:response:length:error:]):
+        (-[WebFrame _saveResourceAndSendRemainingDelegateMessagesWithRequest:identifier:response:data:error:]):
+        * WebView.subproj/WebFrameInternal.h:
+
 2005-05-20  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/4098786> sync. XMLHttpRequest works w/o AllowNetworkAccess key because load delegate is not consulted

diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 88e46de8b7b594be83c13b4466cb5b154beeff40..02d8165032a6c96265dd39d59bdb602dbf742c7c 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -460,7 +460,7 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
 {
     // FIXME: If the WebKit client changes or cancels the request, WebCore does not respect this and continues the load.
     NSError *error;
-    NSString *identifier;
+    id identifier;
     NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
     [_frame _requestFromDelegateForRequest:request identifier:&identifier error:&error];    
     [_frame _saveResourceAndSendRemainingDelegateMessagesWithRequest:request identifier:identifier response:response data:data error:error];
@@ -497,7 +497,7 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
     [request setHTTPUserAgent:[webView userAgentForURL:[request URL]]];
     
     NSError *error = nil;
-    NSString *identifier = nil;    
+    id identifier = nil;    
     NSURLRequest *newRequest = [_frame _requestFromDelegateForRequest:request identifier:&identifier error:&error];
     
     NSURLResponse *response = nil;

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

diff --git a/WebKit/WebView.subproj/WebFrameInternal.h b/WebKit/WebView.subproj/WebFrameInternal.h
index 2cad9bfd998a5346ec29ee8edb1e65ddd60ada00..1a8c8d75985392449b54810d2e1d5dbd1cd6b84f 100644 (file)
--- a/WebKit/WebView.subproj/WebFrameInternal.h
+++ b/WebKit/WebView.subproj/WebFrameInternal.h
@@ -9,10 +9,10 @@
 - (id)_internalLoadDelegate;
 - (void)_unmarkAllMisspellings;
 
-- (NSURLRequest *)_requestFromDelegateForRequest:(NSURLRequest *)request identifier:(NSString **)identifier error:(NSError **)error;
-- (void)_sendRemainingDelegateMessagesWithIdentifier:(NSString *)identifier response:(NSURLResponse *)response length:(unsigned)length error:(NSError *)error;
+- (NSURLRequest *)_requestFromDelegateForRequest:(NSURLRequest *)request identifier:(id *)identifier error:(NSError **)error;
+- (void)_sendRemainingDelegateMessagesWithIdentifier:(id)identifier response:(NSURLResponse *)response length:(unsigned)length error:(NSError *)error;
 - (void)_saveResourceAndSendRemainingDelegateMessagesWithRequest:(NSURLRequest *)request
-                                                      identifier:(NSString *)identifier 
+                                                      identifier:(id)identifier 
                                                         response:(NSURLResponse *)response 
                                                             data:(NSData *)data
                                                            error:(NSError *)error;