[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:38:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 9f155d8062e0b434a492a17c7f1ddf2539908a19
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 23 18:03:37 2003 +0000
WebKit:
Renamed the policy delegate methods.
Reviewed by john.
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate webView:unableToImplementPolicyWithError:frame:]):
(-[WebDefaultPolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
(-[WebDefaultPolicyDelegate webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _handleUnimplementablePolicyWithErrorCode:forURL:]):
(-[WebFrame _checkNewWindowPolicyForRequest:action:frameName:formState:andCall:withSelector:]):
(-[WebFrame _checkNavigationPolicyForRequest:dataSource:formState:andCall:withSelector:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient checkContentPolicyForResponse:]):
* WebView.subproj/WebPolicyDelegate.h:
WebBrowser:
Updated WebBrowser to the renamed WebPolicyDelegate methods.
Reviewed by john.
* BrowserWebController.m:
(-[BrowserWebController webView:unableToImplementPolicyWithError:frame:]):
(-[BrowserWebController openURLExternallyWithRequest:inFrame:]):
(-[BrowserWebController decidePolicyForAction:request:frame:newFrameName:decisionListener:]):
(-[BrowserWebController webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
(-[BrowserWebController webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4161 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 73351da..d73aca6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,21 @@
+2003-04-23 Chris Blumenberg <cblu at apple.com>
+
+ Renamed the policy delegate methods.
+
+ Reviewed by john.
+
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate webView:unableToImplementPolicyWithError:frame:]):
+ (-[WebDefaultPolicyDelegate webView:decidePolicyForNavigationAction:request:frame:decisionListener:]):
+ (-[WebDefaultPolicyDelegate webView:decidePolicyForNewWindowAction:request:newFrameName:decisionListener:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _handleUnimplementablePolicyWithErrorCode:forURL:]):
+ (-[WebFrame _checkNewWindowPolicyForRequest:action:frameName:formState:andCall:withSelector:]):
+ (-[WebFrame _checkNavigationPolicyForRequest:dataSource:formState:andCall:withSelector:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient checkContentPolicyForResponse:]):
+ * WebView.subproj/WebPolicyDelegate.h:
+
2003-04-22 Ken Kocienda <kocienda at apple.com>
Reviewed by Darin
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index 9934c67..043f604 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -28,16 +28,16 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
return sharedDelegate;
}
-- (void)webView: (WebView *)wv unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame
+- (void)webView: (WebView *)wv unableToImplementPolicyWithError:(WebError *)error frame:(WebFrame *)frame
{
ERROR("called unableToImplementPolicyWithError:%@ inFrame:%@", error, frame);
}
-- (void)webView: (WebView *)wv decideContentPolicyForMIMEType:(NSString *)type
- andRequest:(NSURLRequest *)request
- inFrame:(WebFrame *)frame
- decisionListener:(WebPolicyDecisionListener *)listener;
+- (void)webView: (WebView *)wv decidePolicyForMIMEType:(NSString *)type
+ request:(NSURLRequest *)request
+ frame:(WebFrame *)frame
+ decisionListener:(WebPolicyDecisionListener *)listener;
{
if ([[request URL] isFileURL]) {
BOOL isDirectory;
@@ -57,10 +57,10 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
}
-- (void)webView: (WebView *)wv decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(NSURLRequest *)request
- inFrame:(WebFrame *)frame
- decisionListener:(WebPolicyDecisionListener *)listener
+- (void)webView: (WebView *)wv decidePolicyForNavigationAction:(NSDictionary *)actionInformation
+ request:(NSURLRequest *)request
+ frame:(WebFrame *)frame
+ decisionListener:(WebPolicyDecisionListener *)listener
{
if ([NSURLConnection canHandleRequest:request]) {
[listener use];
@@ -74,10 +74,10 @@ static WebDefaultPolicyDelegate *sharedDelegate = nil;
}
}
-- (void)webView: (WebView *)wv decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(NSURLRequest *)request
- newFrameName:(NSString *)frameName
- decisionListener:(WebPolicyDecisionListener *)listener
+- (void)webView: (WebView *)wv decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
+ request:(NSURLRequest *)request
+ newFrameName:(NSString *)frameName
+ decisionListener:(WebPolicyDecisionListener *)listener
{
[listener use];
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 0b0b95e..45c29d7 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1042,7 +1042,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
WebError *error = [WebError _webKitErrorWithCode:code
failingURL:[URL absoluteString]];
WebView *c = [self webView];
- [[c _policyDelegateForwarder] webView:c unableToImplementPolicyWithError:error inFrame:self];
+ [[c _policyDelegateForwarder] webView:c unableToImplementPolicyWithError:error frame:self];
}
- (void)_clearProvisionalDataSource
@@ -1382,10 +1382,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
_private->policyFormState = [formState retain];
WebView *c = [self webView];
- [[c _policyDelegateForwarder] webView:c decideNewWindowPolicyForAction:action
- andRequest:request
- newFrameName:frameName
- decisionListener:listener];
+ [[c _policyDelegateForwarder] webView:c decidePolicyForNewWindowAction:action
+ request:request
+ newFrameName:frameName
+ decisionListener:listener];
[listener release];
}
@@ -1454,10 +1454,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
_private->policyFormState = [formState retain];
WebView *c = [self webView];
- [[c _policyDelegateForwarder] webView:c decideNavigationPolicyForAction:action
- andRequest:request
- inFrame:self
- decisionListener:listener];
+ [[c _policyDelegateForwarder] webView:c decidePolicyForNavigationAction:action
+ request:request
+ frame:self
+ decisionListener:listener];
[listener release];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 9f910d3..64f74e0 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -213,10 +213,10 @@
WebView *c = [dataSource _controller];
[c setDefersCallbacks:YES];
- [[c _policyDelegateForwarder] webView:c decideContentPolicyForMIMEType:[r MIMEType]
- andRequest:[dataSource request]
- inFrame:[dataSource webFrame]
- decisionListener:listener];
+ [[c _policyDelegateForwarder] webView:c decidePolicyForMIMEType:[r MIMEType]
+ request:[dataSource request]
+ frame:[dataSource webFrame]
+ decisionListener:listener];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 9f910d3..64f74e0 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -213,10 +213,10 @@
WebView *c = [dataSource _controller];
[c setDefersCallbacks:YES];
- [[c _policyDelegateForwarder] webView:c decideContentPolicyForMIMEType:[r MIMEType]
- andRequest:[dataSource request]
- inFrame:[dataSource webFrame]
- decisionListener:listener];
+ [[c _policyDelegateForwarder] webView:c decidePolicyForMIMEType:[r MIMEType]
+ request:[dataSource request]
+ frame:[dataSource webFrame]
+ decisionListener:listener];
}
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index 489b023..8cb5eae 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -62,7 +62,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
or the content policy delegate. If there are no more policy
decisions to be made, the resource will be displayed inline if
possible. If there is no view available to display the resource
- inline, then unableToImplementPolicyWithError:inFrame: will be
+ inline, then unableToImplementPolicyWithError:frame: will be
called with an appropriate error.
<p>If a new window is going to be created for this navigation as a
@@ -100,9 +100,9 @@ extern NSString *WebActionOriginalURLKey; // NSURL
policies that determine the action of what to do with the URL or the data that
the URL represents. Typically, the policy handler methods are called in this order:
- decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener: (at most once)<BR>
- decideNavigationPolicyForAction:inFrame::decisionListener: (zero or more times)<BR>
- decideContentPolicyForMIMEType:andRequest:inFrame: (zero or more times)<BR>
+ decidePolicyForNewWindowAction:request:newFrameName:decisionListener: (at most once)<BR>
+ decidePolicyForNavigationAction:request:frame:decisionListener: (zero or more times)<BR>
+ decidePolicyForMIMEType:request:frame: (zero or more times)<BR>
New window policy is always checked. Navigation policy is checked
for the initial load and every redirect unless blocked by an
@@ -118,7 +118,7 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@interface NSObject (WebPolicyDelegate)
/*!
- @method decideNavigationPolicyForAction:andRequest:inFrame:decisionListener:
+ @method decidePolicyForNavigationAction:request:frame:decisionListener:
@abstract This method is called to decide what to do with a proposed navigation.
@param actionInformation Dictionary that describes the action that triggered this navigation.
@param request The request for the proposed navigation
@@ -127,13 +127,13 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@discussion This method will be called before loading starts, and
on every redirect.
*/
-- (void)webView:(WebView *)webView decideNavigationPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(NSURLRequest *)request
- inFrame:(WebFrame *)frame
- decisionListener:(id<WebPolicyDecisionListener>)listener;
+- (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation
+ request:(NSURLRequest *)request
+ frame:(WebFrame *)frame
+ decisionListener:(id<WebPolicyDecisionListener>)listener;
/*!
- @method decideNewWindowPolicyForAction:andRequest:newFrameName:decisionListener:
+ @method decidePolicyForNewWindowAction:request:newFrameName:decisionListener:
@discussion This method is called to decide what to do with an targetted nagivation that would open a new window.
@param actionInformation Dictionary that describes the action that triggered this navigation.
@param request The request for the proposed navigation
@@ -144,27 +144,27 @@ extern NSString *WebActionOriginalURLKey; // NSURL
do something else, like download or present the new frame in a specialized way.
<p>If this method picks a policy of Use, the new window will be
- opened, and decideNavigationPolicyForAction:andRequest:inFrame:decisionListner:
+ opened, and decidePolicyForNavigationAction:request:frame:decisionListner:
will be called with a WebNavigationType of WebNavigationTypeOther
in its action. This is to avoid possible confusion about the modifiers.
*/
-- (void)webView:(WebView *)webView decideNewWindowPolicyForAction:(NSDictionary *)actionInformation
- andRequest:(NSURLRequest *)request
- newFrameName:(NSString *)frameName
- decisionListener:(id<WebPolicyDecisionListener>)listener;
+- (void)webView:(WebView *)webView decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
+ request:(NSURLRequest *)request
+ newFrameName:(NSString *)frameName
+ decisionListener:(id<WebPolicyDecisionListener>)listener;
/*!
- @method decideContentPolicyForMIMEType:andRequest:inFrame:
+ @method decidePolicyForMIMEType:request:frame:
@discussion Returns the policy for content which has been partially loaded. Sent after locationChangeStarted.
@param type MIME type for the resource.
@param request A NSURLRequest for the partially loaded content.
@param frame The frame which is loading the URL.
@param listener The object to call when the decision is made
*/
-- (void)webView:(WebView *)webView decideContentPolicyForMIMEType:(NSString *)type
- andRequest:(NSURLRequest *)request
- inFrame:(WebFrame *)frame
- decisionListener:(id<WebPolicyDecisionListener>)listener;
+- (void)webView:(WebView *)webView decidePolicyForMIMEType:(NSString *)type
+ request:(NSURLRequest *)request
+ frame:(WebFrame *)frame
+ decisionListener:(id<WebPolicyDecisionListener>)listener;
/*!
@method unableToImplementPolicy:error:forURL:inFrame:
@@ -174,6 +174,6 @@ extern NSString *WebActionOriginalURLKey; // NSURL
@param URL The URL of the resource for which a particular action was requested but failed.
@param frame The frame in which the policy could not be implemented.
*/
-- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)webView unableToImplementPolicyWithError:(WebError *)error frame:(WebFrame *)frame;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list