[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 06:56:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2dd9b46482230aa0c9e0d11814b468aafb308310
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 31 02:15:42 2002 +0000
WebKit:
Pass WebResourceRequest rather than just NSURL to URL policy
delegate method.
* WebView.subproj/WebControllerPolicyDelegate.h:
* WebView.subproj/WebDefaultPolicyDelegate.h:
* WebView.subproj/WebDefaultPolicyDelegate.m:
(+[WebDefaultPolicyDelegate defaultURLPolicyForRequest:]):
(-[WebDefaultPolicyDelegate URLPolicyForRequest:inFrame:]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _shouldShowRequest:]):
WebBrowser:
Adjust for WebKit API change.
* BrowserDocument.m:
(-[BrowserDocument _goToURL:referrer:withFallbackURLs:]):
* BrowserWebController.m:
(-[BrowserWebController URLPolicyForRequest:inFrame:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2514 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a2f30fa..5f0f71c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-10-30 Maciej Stachowiak <mjs at apple.com>
+
+ Pass WebResourceRequest rather than just NSURL to URL policy
+ delegate method.
+
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (+[WebDefaultPolicyDelegate defaultURLPolicyForRequest:]):
+ (-[WebDefaultPolicyDelegate URLPolicyForRequest:inFrame:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _shouldShowRequest:]):
+
2002-10-30 Darin Adler <darin at apple.com>
* English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a2f30fa..5f0f71c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-30 Maciej Stachowiak <mjs at apple.com>
+
+ Pass WebResourceRequest rather than just NSURL to URL policy
+ delegate method.
+
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.h:
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (+[WebDefaultPolicyDelegate defaultURLPolicyForRequest:]):
+ (-[WebDefaultPolicyDelegate URLPolicyForRequest:inFrame:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _shouldShowRequest:]):
+
2002-10-30 Darin Adler <darin at apple.com>
* English.lproj/StringsNotToBeLocalized.txt: Updated for recent changes.
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index 934ca41..1326c60 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -197,9 +197,9 @@ typedef enum {
the URL represents. Typically, the policy handler methods are called in this order:
clickPolicyForElement:button:modifierFlags:<BR>
- URLPolicyForURL:inFrame:<BR>
- fileURLPolicyForMIMEType:inFrame:isDirectory:<BR>
- contentPolicyForMIMEType:URL:inFrame:<BR>
+ URLPolicyForRequest:inFrame:<BR>
+ fileURLPolicyForMIMEType:andRequest:inFrame:<BR>
+ contentPolicyForMIMEType:andRequest:inFrame:<BR>
*/
@protocol WebControllerPolicyDelegate <NSObject>
@@ -222,7 +222,7 @@ typedef enum {
@param URL The URL that WebKit has been asked to load.
@param frame The frame which will load the URL.
*/
-- (WebURLPolicy *)URLPolicyForURL:(NSURL *)URL inFrame:(WebFrame *)frame;
+- (WebURLPolicy *)URLPolicyForRequest:(WebResourceRequest *)request inFrame:(WebFrame *)frame;
/*!
@method fileURLPolicyForMIMEType:inFrame:isDirectory:
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h
index 1686bc8..91481d9 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.h
@@ -20,14 +20,14 @@
}
/*!
- @method defaultURLPolicyForURL:
- @abstract Provides the default WebURLPolicy for a URL
+ @method defaultURLPolicyForRequest:
+ @abstract Provides the default WebURLPolicy for a Request
@discussion WebControllerPolicyDelegates can use this method to
- implement the standard behavior for -URLPolicyForURL:.
- @param URL use this URL to determine an appropriate policy
- @result The WebURLPolicy to use for the URL.
+ implement the standard behavior for -URLPolicyForRequest:.
+ @param Request use this request to determine an appropriate policy
+ @result The WebURLPolicy to use for the request.
*/
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL;
++ (WebURLPolicy *)defaultURLPolicyForRequest:(WebResourceRequest *)request;
/*!
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 29ea81a..049b87a 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -14,9 +14,9 @@
@implementation WebDefaultPolicyDelegate
-+ (WebURLPolicy *)defaultURLPolicyForURL: (NSURL *)URL
++ (WebURLPolicy *)defaultURLPolicyForRequest: (WebResourceRequest *)request
{
- if([WebResourceHandle canInitWithRequest:[WebResourceRequest requestWithURL:URL]]){
+ if([WebResourceHandle canInitWithRequest:request]){
return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyUseContentPolicy];
}else{
return [WebURLPolicy webPolicyWithURLAction:WebURLPolicyOpenExternally];
@@ -31,9 +31,9 @@
return self;
}
-- (WebURLPolicy *)URLPolicyForURL:(NSURL *)URL inFrame:(WebFrame *)frame
+- (WebURLPolicy *)URLPolicyForRequest:(WebResourceRequest *)request inFrame:(WebFrame *)frame
{
- return [WebDefaultPolicyDelegate defaultURLPolicyForURL:URL];
+ return [WebDefaultPolicyDelegate defaultURLPolicyForRequest:request];
}
- (WebFileURLPolicy *)fileURLPolicyForMIMEType:(NSString *)type andRequest:(WebResourceRequest *)request inFrame:(WebFrame *)frame
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 22c0d86..413844c 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -611,7 +611,7 @@ static const char * const stateNames[] = {
- (BOOL)_shouldShowRequest:(WebResourceRequest *)request
{
id <WebControllerPolicyDelegate> policyDelegate = [[self controller] policyDelegate];
- WebURLPolicy *URLPolicy = [policyDelegate URLPolicyForURL:[request URL] inFrame:self];
+ WebURLPolicy *URLPolicy = [policyDelegate URLPolicyForRequest:request inFrame:self];
switch ([URLPolicy policyAction]) {
case WebURLPolicyIgnore:
@@ -685,7 +685,7 @@ static const char * const stateNames[] = {
}
default:
- [NSException raise:NSInvalidArgumentException format:@"URLPolicyForURL: returned an invalid WebURLPolicy"];
+ [NSException raise:NSInvalidArgumentException format:@"URLPolicyForRequest: returned an invalid WebURLPolicy"];
return NO;
}
}
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 934ca41..1326c60 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -197,9 +197,9 @@ typedef enum {
the URL represents. Typically, the policy handler methods are called in this order:
clickPolicyForElement:button:modifierFlags:<BR>
- URLPolicyForURL:inFrame:<BR>
- fileURLPolicyForMIMEType:inFrame:isDirectory:<BR>
- contentPolicyForMIMEType:URL:inFrame:<BR>
+ URLPolicyForRequest:inFrame:<BR>
+ fileURLPolicyForMIMEType:andRequest:inFrame:<BR>
+ contentPolicyForMIMEType:andRequest:inFrame:<BR>
*/
@protocol WebControllerPolicyDelegate <NSObject>
@@ -222,7 +222,7 @@ typedef enum {
@param URL The URL that WebKit has been asked to load.
@param frame The frame which will load the URL.
*/
-- (WebURLPolicy *)URLPolicyForURL:(NSURL *)URL inFrame:(WebFrame *)frame;
+- (WebURLPolicy *)URLPolicyForRequest:(WebResourceRequest *)request inFrame:(WebFrame *)frame;
/*!
@method fileURLPolicyForMIMEType:inFrame:isDirectory:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list