[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:41:33 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c0ef7b0f33fc31ca25012012d8b53546a2375e7e
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat May 10 06:25:43 2003 +0000
WebFoundation:
Reviewed by Darin.
- removed subclasses of NSURLAuthenticationChallenge, and added a
`sender' field to allow challenged to be handled generically.
* AuthenticationManager.subproj/NSHTTPAuthenticator.h:
* AuthenticationManager.subproj/NSHTTPAuthenticator.m:
(-[NSHTTPAuthenticator _tryChallenge:]):
(-[NSHTTPAuthenticator _askDelegateWithURL:realm:forRequest:failureCount:failureResponse:protocol:withCallback:context:]):
(-[NSHTTPAuthenticator _askDelegateWithURL:proxy:forRequest:failureCount:failureResponse:protocol:withCallback:context:]):
(-[NSHTTPAuthenticator useCredential:forAuthenticationChallenge:]):
(-[NSHTTPAuthenticator continueWithoutCredentialForAuthenticationChallenge:]):
* AuthenticationManager.subproj/NSURLAuthenticationChallenge.h:
* AuthenticationManager.subproj/NSURLAuthenticationChallenge.m:
(-[NSURLAuthenticationChallengeInternal initWithProtectionSpace:proposedCredential:previousFailureCount:failureResponse:error:sender:]):
(-[NSURLAuthenticationChallenge initWithProtectionSpace:proposedCredential:previousFailureCount:failureResponse:error:sender:]):
(-[NSURLAuthenticationChallenge initWithAuthenticationChallenge:sender:]):
(-[NSURLAuthenticationChallenge failureResponse]):
(-[NSURLAuthenticationChallenge sender]):
* AuthenticationManager.subproj/NSURLConnectionAuthenticationChallenge.h: Removed.
* AuthenticationManager.subproj/NSURLConnectionAuthenticationChallenge.m: Removed.
* AuthenticationManager.subproj/NSURLConnectionAuthenticationChallengeInternal.h: Removed.
* AuthenticationManager.subproj/NSURLDownloadAuthenticationChallenge.h: Removed.
* AuthenticationManager.subproj/NSURLDownloadAuthenticationChallenge.m: Removed.
* AuthenticationManager.subproj/NSURLDownloadAuthenticationChallengeInternal.h: Removed.
* AuthenticationManager.subproj/NSURLProtocolAuthenticationChallenge.h: Removed.
* AuthenticationManager.subproj/NSURLProtocolAuthenticationChallenge.m: Removed.
* CacheLoader.subproj/NSURLConnection.h:
* CacheLoader.subproj/NSURLConnection.m:
(-[NSURLConnection useCredential:forAuthenticationChallenge:]):
(-[NSURLConnection continueWithoutCredentialForAuthenticationChallenge:]):
(-[NSURLConnection cancelAuthenticationChallenge:]):
(-[NSURLConnection _sendDidReceiveAuthenticationCallback]):
(-[NSURLConnection _sendDidCancelAuthenticationCallback]):
(-[NSURLConnection _performUseCredential]):
(-[NSURLConnection _performContinueWithoutCredential]):
(-[NSURLConnection _didReceiveAuthenticationChallenge:]):
(-[NSURLConnection _didCancelAuthenticationChallenge:]):
(-[NSURLConnectionInternal URLProtocol:didReceiveAuthenticationChallenge:]):
(-[NSURLConnectionInternal URLProtocol:didCancelAuthenticationChallenge:]):
* CacheLoader.subproj/NSURLProtocol.h:
* FileTransfer.subproj/NSURLDownload.h:
* FileTransfer.subproj/NSURLDownload.m:
(-[NSURLDownload useCredential:forAuthenticationChallenge:]):
(-[NSURLDownload continueWithoutCredentialForAuthenticationChallenge:]):
(-[NSURLDownload cancelAuthenticationChallenge:]):
(-[NSURLDownload connection:didReceiveAuthenticationChallenge:]):
(-[NSURLDownload connection:didCancelAuthenticationChallenge:]):
(-[NSURLDownload connection:didReceiveResponse:]):
(-[NSURLConnectionDelegateProxy connection:didReceiveAuthenticationChallenge:]):
(-[NSURLConnectionDelegateProxy connection:didCancelAuthenticationChallenge:]):
* FileTransfer.subproj/NSURLUpload.h:
* Misc.subproj/WebFoundation.h:
* ProtocolHandlers.subproj/NSCFNetworkHTTPURLProtocol.h:
* ProtocolHandlers.subproj/NSCFNetworkHTTPURLProtocol.m:
(-[NSCFNetworkHTTPURLProtocol useCredential:forAuthenticationChallenge:]):
(-[NSCFNetworkHTTPURLProtocol continueWithoutCredentialForAuthenticationChallenge:]):
(-[NSCFNetworkHTTPURLProtocol cancelAuthenticationChallenge:]):
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by Darin.
- removed WebAuthenticationChallenge
- adjusted everything for removal of NSURLAuthenticationChallenge subclasses.
* Misc.subproj/WebDownload.m:
(-[WebDownloadInternal download:didReceiveAuthenticationChallenge:]):
(-[WebDownloadInternal download:didCancelAuthenticationChallenge:]):
* Panels.subproj/WebPanelAuthenticationHandler.m:
(-[WebPanelAuthenticationHandler startAuthentication:window:]):
(-[WebPanelAuthenticationHandler _authenticationDoneWithChallenge:result:]):
* WebView.subproj/WebAuthenticationChallenge.h: Removed.
* WebView.subproj/WebAuthenticationChallenge.m: Removed.
* WebView.subproj/WebAuthenticationChallengeInternal.h: Removed.
* WebView.subproj/WebBaseResourceHandleDelegate.h:
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate useCredential:forAuthenticationChallenge:]):
(-[WebBaseResourceHandleDelegate continueWithoutCredentialForAuthenticationChallenge:]):
(-[WebBaseResourceHandleDelegate cancelAuthenticationChallenge:]):
(-[WebBaseResourceHandleDelegate connection:didReceiveAuthenticationChallenge:]):
(-[WebBaseResourceHandleDelegate connection:didCancelAuthenticationChallenge:]):
(-[WebBaseResourceHandleDelegate setIdentifier:]):
* WebView.subproj/WebDefaultResourceLoadDelegate.m:
(-[WebDefaultResourceLoadDelegate webView:resource:didReceiveAuthenticationChallenge:fromDataSource:]):
(-[WebDefaultResourceLoadDelegate webView:resource:didCancelAuthenticationChallenge:fromDataSource:]):
* WebView.subproj/WebResourceLoadDelegate.h:
* Misc.subproj/WebKit.h: Remove headers that are gone.
* WebKit.exp: Remove classes that are gone.
* WebKit.pbproj/project.pbxproj: Remove files that are gone.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4341 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 120e80c..d62a868 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,35 @@
+2003-05-09 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - removed WebAuthenticationChallenge
+ - adjusted everything for removal of NSURLAuthenticationChallenge subclasses.
+
+ * Misc.subproj/WebDownload.m:
+ (-[WebDownloadInternal download:didReceiveAuthenticationChallenge:]):
+ (-[WebDownloadInternal download:didCancelAuthenticationChallenge:]):
+ * Panels.subproj/WebPanelAuthenticationHandler.m:
+ (-[WebPanelAuthenticationHandler startAuthentication:window:]):
+ (-[WebPanelAuthenticationHandler _authenticationDoneWithChallenge:result:]):
+ * WebView.subproj/WebAuthenticationChallenge.h: Removed.
+ * WebView.subproj/WebAuthenticationChallenge.m: Removed.
+ * WebView.subproj/WebAuthenticationChallengeInternal.h: Removed.
+ * WebView.subproj/WebBaseResourceHandleDelegate.h:
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate useCredential:forAuthenticationChallenge:]):
+ (-[WebBaseResourceHandleDelegate continueWithoutCredentialForAuthenticationChallenge:]):
+ (-[WebBaseResourceHandleDelegate cancelAuthenticationChallenge:]):
+ (-[WebBaseResourceHandleDelegate connection:didReceiveAuthenticationChallenge:]):
+ (-[WebBaseResourceHandleDelegate connection:didCancelAuthenticationChallenge:]):
+ (-[WebBaseResourceHandleDelegate setIdentifier:]):
+ * WebView.subproj/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:resource:didReceiveAuthenticationChallenge:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:didCancelAuthenticationChallenge:fromDataSource:]):
+ * WebView.subproj/WebResourceLoadDelegate.h:
+ * Misc.subproj/WebKit.h: Remove headers that are gone.
+ * WebKit.exp: Remove classes that are gone.
+ * WebKit.pbproj/project.pbxproj: Remove files that are gone.
+
2003-05-09 David Hyatt <hyatt at apple.com>
Change the minfontsize to 1, i.e., to have no minimum. This
diff --git a/WebKit/Misc.subproj/WebDownload.m b/WebKit/Misc.subproj/WebDownload.m
index e750ef6..7996302 100644
--- a/WebKit/Misc.subproj/WebDownload.m
+++ b/WebKit/Misc.subproj/WebDownload.m
@@ -5,7 +5,7 @@
#import <WebKit/WebDownload.h>
#import <WebFoundation/NSURLDownload.h>
-#import <WebFoundation/NSURLDownloadAuthenticationChallenge.h>
+#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebFoundation/NSURLDownloadPrivate.h>
#import <WebKit/WebPanelAuthenticationHandler.h>
@@ -73,7 +73,7 @@
return [realDelegate download:download willSendRequest:request redirectResponse:redirectResponse];
}
-- (void)download:(NSURLDownload *)download didReceiveAuthenticationChallenge:(NSURLDownloadAuthenticationChallenge *)challenge
+- (void)download:(NSURLDownload *)download didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
if ([realDelegate respondsToSelector:@selector(download:didReceiveAuthenticationChallenge:)]) {
[realDelegate download:download didReceiveAuthenticationChallenge:challenge];
@@ -87,7 +87,7 @@
}
}
-- (void)download:(NSURLDownload *)download didCancelAuthenticationChallenge:(NSURLDownloadAuthenticationChallenge *)challenge
+- (void)download:(NSURLDownload *)download didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
if ([realDelegate respondsToSelector:@selector(download:didCancelAuthenticationChallenge:)]) {
[realDelegate download:download didCancelAuthenticationChallenge:challenge];
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index dc35c13..e9ee09c 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -5,7 +5,6 @@
Public header file.
*/
-#import <WebKit/WebAuthenticationChallenge.h>
#import <WebKit/WebBackForwardList.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDocument.h>
diff --git a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
index 00480fa..575fed1 100644
--- a/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
+++ b/WebKit/Panels.subproj/WebPanelAuthenticationHandler.m
@@ -6,11 +6,10 @@
#import <WebKit/WebPanelAuthenticationHandler.h>
-#import <WebKit/WebAuthenticationChallenge.h>
#import <WebKit/WebAuthenticationPanel.h>
+#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
-#import <WebFoundation/NSURLDownloadAuthenticationChallenge.h>
static NSString *WebModalDialogPretendWindow = @"WebModalDialogPretendWindow";
@@ -46,9 +45,6 @@ WebPanelAuthenticationHandler *sharedHandler;
-(void)startAuthentication:(NSURLAuthenticationChallenge *)challenge window:(NSWindow *)w
{
- ASSERT([challenge isKindOfClass:[WebAuthenticationChallenge class]] ||
- [challenge isKindOfClass:[NSURLDownloadAuthenticationChallenge class]]);
-
if ([w attachedSheet] != nil) {
w = nil;
}
@@ -56,15 +52,7 @@ WebPanelAuthenticationHandler *sharedHandler;
id window = w ? (id)w : (id)WebModalDialogPretendWindow;
if ([windowToPanel objectForKey:window] != nil) {
- if ([challenge isKindOfClass:[WebAuthenticationChallenge class]]) {
- WebAuthenticationChallenge *webChallenge = (WebAuthenticationChallenge *)challenge;
- [webChallenge cancel];
- } else if ([challenge isKindOfClass:[NSURLDownloadAuthenticationChallenge class]]) {
- NSURLDownloadAuthenticationChallenge *downloadChallenge = (NSURLDownloadAuthenticationChallenge *)challenge;
- [[downloadChallenge download] cancel];
- } else {
- ASSERT_NOT_REACHED();
- }
+ [[challenge sender] cancelAuthenticationChallenge:challenge];
return;
}
@@ -97,24 +85,10 @@ WebPanelAuthenticationHandler *sharedHandler;
[challengeToWindow removeObjectForKey:challenge];
}
- if ([challenge isKindOfClass:[WebAuthenticationChallenge class]]) {
- WebAuthenticationChallenge *webChallenge = (WebAuthenticationChallenge *)challenge;
-
- if (credential == nil) {
- [webChallenge cancel];
- } else {
- [webChallenge useCredential:credential];
- }
- } else if ([challenge isKindOfClass:[NSURLDownloadAuthenticationChallenge class]]) {
- NSURLDownloadAuthenticationChallenge *downloadChallenge = (NSURLDownloadAuthenticationChallenge *)challenge;
-
- if (credential == nil) {
- [[downloadChallenge download] cancel];
- } else {
- [[downloadChallenge download] useCredential:credential forAuthenticationChallenge:downloadChallenge];
- }
+ if (credential == nil) {
+ [[challenge sender] cancelAuthenticationChallenge:challenge];
} else {
- ASSERT_NOT_REACHED();
+ [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge];
}
}
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index 73643aa..1debc0c 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -1,4 +1,3 @@
-.objc_class_name_WebAuthenticationChallenge
.objc_class_name_WebBackForwardList
.objc_class_name_WebCoreStatistics
.objc_class_name_WebDataSource
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 554e4db..70ab122 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -291,9 +291,7 @@
70ECD6CE043B727400A80181,
515E27CD0458C86500CA2D3A,
515E27D10458CA4B00CA2D3A,
- 65840820045E752600000128,
6578F5E0045F817400000128,
- 650EFE54045FCE6C00000128,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -405,7 +403,6 @@
70ECD6CF043B727400A80181,
515E27D20458CA4B00CA2D3A,
6578F5E1045F817400000128,
- 65FB4D49045FCD7F00000128,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -1386,18 +1383,6 @@
//652
//653
//654
- 650EFE53045FCE6C00000128 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebAuthenticationChallengeInternal.h;
- refType = 4;
- };
- 650EFE54045FCE6C00000128 = {
- fileRef = 650EFE53045FCE6C00000128;
- isa = PBXBuildFile;
- settings = {
- };
- };
6523FACF032DA06B005EFCFF = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -1605,33 +1590,6 @@
settings = {
};
};
- 6584081F045E752600000128 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebAuthenticationChallenge.h;
- refType = 4;
- };
- 65840820045E752600000128 = {
- fileRef = 6584081F045E752600000128;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 65FB4D47045FCD7F00000128 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebAuthenticationChallenge.m;
- refType = 4;
- };
- 65FB4D49045FCD7F00000128 = {
- fileRef = 65FB4D47045FCD7F00000128;
- isa = PBXBuildFile;
- settings = {
- };
- };
//650
//651
//652
@@ -2287,7 +2245,6 @@
9CF0E24A021361B00ECA16EA,
51A8B52E04282B5900CA2D3A,
51A8B52F04282B5900CA2D3A,
- 650EFE53045FCE6C00000128,
51A8B53204282BD200CA2D3A,
51A8B53304282BD200CA2D3A,
F5D538E802441F2601A80181,
@@ -2304,8 +2261,6 @@
51A8B57A042834F700CA2D3A,
51A8B57D0428353A00CA2D3A,
51A8B57E0428353A00CA2D3A,
- 6584081F045E752600000128,
- 65FB4D47045FCD7F00000128,
);
isa = PBXGroup;
name = WebView;
diff --git a/WebKit/WebView.subproj/WebAuthenticationChallenge.h b/WebKit/WebView.subproj/WebAuthenticationChallenge.h
deleted file mode 100644
index 5c224d0..0000000
--- a/WebKit/WebView.subproj/WebAuthenticationChallenge.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- WebAuthenticationChallenge.h
- Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <WebFoundation/NSURLAuthenticationChallenge.h>
-
- at class WebAuthenticationChallengeInternal;
-
-/*!
- @class WebAuthenticationChallenge
- @discussion This class represents an authentication challenge
- issued by WebKit.
-*/
- at interface WebAuthenticationChallenge : NSURLAuthenticationChallenge
-{
- at private
- WebAuthenticationChallengeInternal *_webInternal;
-}
-
-/*!
- @method useCredential:
- @abstract Continue using the provided credential.
- @param credential The credential to use.
-*/
-- (void)useCredential:(NSURLCredential *)credential;
-
-/*!
- @method cancel
- @abstract Cancel the load that caused the challenge.
-*/
-- (void)cancel;
-
-/*!
- @method continueWithoutCredential
- @abstract Continue loading without providing a credential.
-*/
-- (void)continueWithoutCredential;
-
- at end
diff --git a/WebKit/WebView.subproj/WebAuthenticationChallenge.m b/WebKit/WebView.subproj/WebAuthenticationChallenge.m
deleted file mode 100644
index c3106de..0000000
--- a/WebKit/WebView.subproj/WebAuthenticationChallenge.m
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- WebAuthenticationChallenge.m
- Copyright 2003 Apple, Inc. All rights reserved.
-*/
-
-
-#import <WebKit/WebAuthenticationChallenge.h>
-#import <WebKit/WebAuthenticationChallengeInternal.h>
-#import <WebKit/WebBaseResourceHandleDelegate.h>
-
- at interface WebAuthenticationChallengeInternal : NSObject
-{
- at public
- WebBaseResourceHandleDelegate *delegate;
-}
-
-- (id)initWithDelegate:(WebBaseResourceHandleDelegate *)d;
- at end
-
- at implementation WebAuthenticationChallengeInternal
-
-- (id)initWithDelegate:(WebBaseResourceHandleDelegate *)d
-{
- self = [super init];
- if (self != nil) {
- delegate = [d retain];
- }
- return self;
-}
-
-- (void)dealloc
-{
- [delegate release];
- [super dealloc];
-}
-
- at end
-
-
- at implementation WebAuthenticationChallenge (Internal)
-
-- (id)_initWithAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge delegate:(WebBaseResourceHandleDelegate *)delegate
-{
- self = [super initWithAuthenticationChallenge:challenge];
- if (self != nil) {
- _webInternal = [[WebAuthenticationChallengeInternal alloc] initWithDelegate:delegate];
- }
- return self;
-}
-
- at end
-
- at implementation WebAuthenticationChallenge
-
-- (void)dealloc
-{
- [_webInternal release];
- [super dealloc];
-}
-
-- (void)useCredential:(NSURLCredential *)credential
-{
- [_webInternal->delegate useCredential:credential forAuthenticationChallenge:self];
-}
-
-- (void)cancel
-{
- [_webInternal->delegate cancel];
-
-}
-
-- (void)continueWithoutCredential
-{
- [_webInternal->delegate continueWithoutCredentialForAuthenticationChallenge:self];
-}
-
- at end
diff --git a/WebKit/WebView.subproj/WebAuthenticationChallengeInternal.h b/WebKit/WebView.subproj/WebAuthenticationChallengeInternal.h
deleted file mode 100644
index a350149..0000000
--- a/WebKit/WebView.subproj/WebAuthenticationChallengeInternal.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- WebAuthenticationChallenge.h
- Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
-*/
-
-#import <WebKit/WebAuthenticationChallenge.h>
-
- at class WebBaseResourceHandleDelegate;
-
- at interface WebAuthenticationChallenge (Internal)
-
-- (id)_initWithAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge delegate:(WebBaseResourceHandleDelegate *)delegate;
-
- at end
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
index 95e58f1..d346379 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.h
@@ -8,12 +8,12 @@
#import <WebKit/WebViewPrivate.h>
@class NSError;
+ at class NSURLAuthenticationChallenge;
@class NSURLConnection;
@class NSURLConnectionAuthenticationChallenge;
@class NSURLCredential;
@class NSURLRequest;
@class NSURLResponse;
- at class WebAuthenticationChallenge;
@class WebDataSource;
@class WebView;
@@ -29,8 +29,8 @@
id identifier;
id resourceLoadDelegate;
id downloadDelegate;
- NSURLConnectionAuthenticationChallenge *currentConnectionChallenge;
- WebAuthenticationChallenge *currentWebChallenge;
+ NSURLAuthenticationChallenge *currentConnectionChallenge;
+ NSURLAuthenticationChallenge *currentWebChallenge;
BOOL reachedTerminalState;
BOOL defersCallbacks;
WebResourceDelegateImplementationCache implementations;
@@ -54,8 +54,4 @@
- (void)setIdentifier:(id)ident;
-- (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
-
-- (void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
-
@end
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index a2d809e..214efb4 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -5,8 +5,8 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLConnectionAuthenticationChallenge.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
@@ -15,8 +15,6 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebKit/WebAuthenticationChallenge.h>
-#import <WebKit/WebAuthenticationChallengeInternal.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
@@ -24,6 +22,52 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
+ at interface WebBaseResourceHandleDelegate (WebNSURLAuthenticationChallengeSender) <NSURLAuthenticationChallengeSender>
+ at end
+
+ at implementation WebBaseResourceHandleDelegate (WebNSURLAuthenticationChallengeSender)
+
+- (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+ if (challenge == nil || challenge != currentWebChallenge) {
+ return;
+ }
+
+ [[currentConnectionChallenge sender] useCredential:credential forAuthenticationChallenge:currentConnectionChallenge];
+
+ [currentConnectionChallenge release];
+ currentConnectionChallenge = nil;
+
+ [currentWebChallenge release];
+ currentWebChallenge = nil;
+}
+
+- (void)continueWithoutCredentialForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+ if (challenge == nil || challenge != currentWebChallenge) {
+ return;
+ }
+
+ [[currentConnectionChallenge sender] continueWithoutCredentialForAuthenticationChallenge:currentConnectionChallenge];
+
+ [currentConnectionChallenge release];
+ currentConnectionChallenge = nil;
+
+ [currentWebChallenge release];
+ currentWebChallenge = nil;
+}
+
+- (void)cancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+ if (challenge == nil || challenge != currentWebChallenge) {
+ return;
+ }
+
+ [self cancel];
+}
+
+ at end
+
@implementation WebBaseResourceHandleDelegate
- (void)_releaseResources
@@ -183,7 +227,7 @@
return request;
}
-- (void)connection:(NSURLConnection *)con didReceiveAuthenticationChallenge:(NSURLConnectionAuthenticationChallenge *)challenge
+- (void)connection:(NSURLConnection *)con didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
@@ -192,7 +236,7 @@
ASSERT(!currentWebChallenge);
currentConnectionChallenge = [challenge retain];;
- currentWebChallenge = [[WebAuthenticationChallenge alloc] _initWithAuthenticationChallenge:challenge delegate:self];
+ currentWebChallenge = [[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:challenge sender:self];
if (implementations.delegateImplementsDidReceiveAuthenticationChallenge) {
[resourceLoadDelegate webView:webView resource:identifier didReceiveAuthenticationChallenge:currentWebChallenge fromDataSource:dataSource];
@@ -201,7 +245,7 @@
}
}
--(void)connection:(NSURLConnection *)con didCancelAuthenticationChallenge:(NSURLConnectionAuthenticationChallenge *)challenge
+-(void)connection:(NSURLConnection *)con didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
@@ -217,37 +261,6 @@
}
}
-
--(void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge
-{
- if (challenge == nil || challenge != currentWebChallenge) {
- return;
- }
-
- [[currentConnectionChallenge connection] useCredential:credential forAuthenticationChallenge:currentConnectionChallenge];
-
- [currentConnectionChallenge release];
- currentConnectionChallenge = nil;
-
- [currentWebChallenge release];
- currentWebChallenge = nil;
-}
-
--(void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge
-{
- if (challenge == nil || challenge != currentWebChallenge) {
- return;
- }
-
- [[currentConnectionChallenge connection] continueWithoutCredentialForAuthenticationChallenge:currentConnectionChallenge];
-
- [currentConnectionChallenge release];
- currentConnectionChallenge = nil;
-
- [currentWebChallenge release];
- currentWebChallenge = nil;
-}
-
- (void)connection:(NSURLConnection *)con didReceiveResponse:(NSURLResponse *)r
{
ASSERT(con == connection);
@@ -350,5 +363,4 @@
}
}
-
@end
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index f70197b..62327df 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -5,13 +5,12 @@
#import <WebKit/WebDefaultResourceLoadDelegate.h>
-#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLConnectionAuthenticationChallenge.h>
+#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLResponse.h>
#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebKit/WebAuthenticationChallenge.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebPanelAuthenticationHandler.h>
#import <WebKit/WebView.h>
@@ -41,13 +40,13 @@ static WebDefaultResourceLoadDelegate *sharedDelegate = nil;
return newRequest;
}
-- (void)webView:(WebView *)wv resource:(id)identifier didReceiveAuthenticationChallenge:(WebAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
+- (void)webView:(WebView *)wv resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
{
NSWindow *window = [wv hostWindow] ? [wv hostWindow] : [wv window];
[[WebPanelAuthenticationHandler sharedHandler] startAuthentication:challenge window:window];
}
-- (void)webView:(WebView *)wv resource:(id)identifier didCancelAuthenticationChallenge:(WebAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
+- (void)webView:(WebView *)wv resource:(id)identifier didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
{
[(WebPanelAuthenticationHandler *)[WebPanelAuthenticationHandler sharedHandler] cancelAuthentication:challenge];
}
diff --git a/WebKit/WebView.subproj/WebLoader.h b/WebKit/WebView.subproj/WebLoader.h
index 95e58f1..d346379 100644
--- a/WebKit/WebView.subproj/WebLoader.h
+++ b/WebKit/WebView.subproj/WebLoader.h
@@ -8,12 +8,12 @@
#import <WebKit/WebViewPrivate.h>
@class NSError;
+ at class NSURLAuthenticationChallenge;
@class NSURLConnection;
@class NSURLConnectionAuthenticationChallenge;
@class NSURLCredential;
@class NSURLRequest;
@class NSURLResponse;
- at class WebAuthenticationChallenge;
@class WebDataSource;
@class WebView;
@@ -29,8 +29,8 @@
id identifier;
id resourceLoadDelegate;
id downloadDelegate;
- NSURLConnectionAuthenticationChallenge *currentConnectionChallenge;
- WebAuthenticationChallenge *currentWebChallenge;
+ NSURLAuthenticationChallenge *currentConnectionChallenge;
+ NSURLAuthenticationChallenge *currentWebChallenge;
BOOL reachedTerminalState;
BOOL defersCallbacks;
WebResourceDelegateImplementationCache implementations;
@@ -54,8 +54,4 @@
- (void)setIdentifier:(id)ident;
-- (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
-
-- (void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge;
-
@end
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index a2d809e..214efb4 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -5,8 +5,8 @@
#import <WebKit/WebBaseResourceHandleDelegate.h>
+#import <WebFoundation/NSURLAuthenticationChallenge.h>
#import <WebFoundation/NSURLConnection.h>
-#import <WebFoundation/NSURLConnectionAuthenticationChallenge.h>
#import <WebFoundation/NSURLConnectionPrivate.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/NSURLRequestPrivate.h>
@@ -15,8 +15,6 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebNSErrorExtras.h>
-#import <WebKit/WebAuthenticationChallenge.h>
-#import <WebKit/WebAuthenticationChallengeInternal.h>
#import <WebKit/WebDataProtocol.h>
#import <WebKit/WebDataSourcePrivate.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
@@ -24,6 +22,52 @@
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
+ at interface WebBaseResourceHandleDelegate (WebNSURLAuthenticationChallengeSender) <NSURLAuthenticationChallengeSender>
+ at end
+
+ at implementation WebBaseResourceHandleDelegate (WebNSURLAuthenticationChallengeSender)
+
+- (void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+ if (challenge == nil || challenge != currentWebChallenge) {
+ return;
+ }
+
+ [[currentConnectionChallenge sender] useCredential:credential forAuthenticationChallenge:currentConnectionChallenge];
+
+ [currentConnectionChallenge release];
+ currentConnectionChallenge = nil;
+
+ [currentWebChallenge release];
+ currentWebChallenge = nil;
+}
+
+- (void)continueWithoutCredentialForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+ if (challenge == nil || challenge != currentWebChallenge) {
+ return;
+ }
+
+ [[currentConnectionChallenge sender] continueWithoutCredentialForAuthenticationChallenge:currentConnectionChallenge];
+
+ [currentConnectionChallenge release];
+ currentConnectionChallenge = nil;
+
+ [currentWebChallenge release];
+ currentWebChallenge = nil;
+}
+
+- (void)cancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+ if (challenge == nil || challenge != currentWebChallenge) {
+ return;
+ }
+
+ [self cancel];
+}
+
+ at end
+
@implementation WebBaseResourceHandleDelegate
- (void)_releaseResources
@@ -183,7 +227,7 @@
return request;
}
-- (void)connection:(NSURLConnection *)con didReceiveAuthenticationChallenge:(NSURLConnectionAuthenticationChallenge *)challenge
+- (void)connection:(NSURLConnection *)con didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
@@ -192,7 +236,7 @@
ASSERT(!currentWebChallenge);
currentConnectionChallenge = [challenge retain];;
- currentWebChallenge = [[WebAuthenticationChallenge alloc] _initWithAuthenticationChallenge:challenge delegate:self];
+ currentWebChallenge = [[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:challenge sender:self];
if (implementations.delegateImplementsDidReceiveAuthenticationChallenge) {
[resourceLoadDelegate webView:webView resource:identifier didReceiveAuthenticationChallenge:currentWebChallenge fromDataSource:dataSource];
@@ -201,7 +245,7 @@
}
}
--(void)connection:(NSURLConnection *)con didCancelAuthenticationChallenge:(NSURLConnectionAuthenticationChallenge *)challenge
+-(void)connection:(NSURLConnection *)con didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
{
ASSERT(con == connection);
ASSERT(!reachedTerminalState);
@@ -217,37 +261,6 @@
}
}
-
--(void)useCredential:(NSURLCredential *)credential forAuthenticationChallenge:(WebAuthenticationChallenge *)challenge
-{
- if (challenge == nil || challenge != currentWebChallenge) {
- return;
- }
-
- [[currentConnectionChallenge connection] useCredential:credential forAuthenticationChallenge:currentConnectionChallenge];
-
- [currentConnectionChallenge release];
- currentConnectionChallenge = nil;
-
- [currentWebChallenge release];
- currentWebChallenge = nil;
-}
-
--(void)continueWithoutCredentialForAuthenticationChallenge:(WebAuthenticationChallenge *)challenge
-{
- if (challenge == nil || challenge != currentWebChallenge) {
- return;
- }
-
- [[currentConnectionChallenge connection] continueWithoutCredentialForAuthenticationChallenge:currentConnectionChallenge];
-
- [currentConnectionChallenge release];
- currentConnectionChallenge = nil;
-
- [currentWebChallenge release];
- currentWebChallenge = nil;
-}
-
- (void)connection:(NSURLConnection *)con didReceiveResponse:(NSURLResponse *)r
{
ASSERT(con == connection);
@@ -350,5 +363,4 @@
}
}
-
@end
diff --git a/WebKit/WebView.subproj/WebResourceLoadDelegate.h b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
index 14800c3..0e0a331 100644
--- a/WebKit/WebView.subproj/WebResourceLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebResourceLoadDelegate.h
@@ -6,9 +6,9 @@
*/
@class WebView;
@class WebDataSource;
+ at class NSURLAuthenticationChallenge;
@class NSURLResponse;
@class NSURLRequest;
- at class WebAuthenticationChallenge;
/*!
@category WebResourceLoadDelegate
@@ -59,18 +59,18 @@
@abstract Start authentication for the resource, providing a challenge
@discussion Call useCredential::, continueWithoutCredential or
cancel on the challenge when done.
- @param challenge The NSURLConnectionAuthenticationChallenge to start authentication for
+ @param challenge The NSURLAuthenticationChallenge to start authentication for
@discussion If you do not implement this delegate method, WebKit will handle authentication
automatically by prompting with a sheet on the window that the WebView is associated with.
*/
-- (void)webView:(WebView *)sender resource:(id)identifier didReceiveAuthenticationChallenge:(WebAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource;
/*!
@method webView:resource:didCancelAuthenticationChallenge:fromDataSource:
@abstract Cancel authentication for a given request
- @param challenge The WebAuthenticationChallenge to cancel authentication for
+ @param challenge The NSURLAuthenticationChallenge for which to cancel authentication
*/
-- (void)webView:(WebView *)sender resource:(id)identifier didCancelAuthenticationChallenge:(WebAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource;
+- (void)webView:(WebView *)sender resource:(id)identifier didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource;
/*!
@method webView:resource:didReceiveResponse:fromDataSource:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list