[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:27:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0d4a98f6a408f20b742ea91f0abbb868f26b41e2
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 6 21:48:48 2003 +0000
WebKit:
Reviewed by John.
Step towards policy API chantes - removed unneeded policy and URL
arguments from unableToImplementPolicy:
* WebView.subproj/WebControllerPolicyDelegate.h:
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient continueAfterContentPolicy:response:]):
WebBrowser:
Reviewed by John.
Updated for WebKit API change.
* BrowserWebController.m:
(-[BrowserWebController
unableToImplementPolicyWithError:inFrame:]): Removed URL and
policy arguments.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3765 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9d1eee5..95adb12 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-03-05 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ Step towards policy API chantes - removed unneeded policy and URL
+ arguments from unableToImplementPolicy:
+
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+
2003-03-06 Ed Voas voas at apple.com
Reviewed by Richard.
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index c384f79..46fdad5 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -137,6 +137,6 @@ typedef enum {
@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)unableToImplementPolicy:(WebPolicyAction)policy error:(WebError *)error forURL:(NSURL *)URL inFrame:(WebFrame *)frame;
+- (void)unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 3383d3d..752d483 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -147,7 +147,7 @@ typedef enum {
- (WebHistoryItem *)_itemForSavingDocState;
- (WebHistoryItem *)_itemForRestoringDocState;
-- (void)_handleUnimplementablePolicy:(WebPolicyAction)policy errorCode:(int)code forURL:(NSURL *)URL;
+- (void)_handleUnimplementablePolicyWithErrorCode:(int)code forURL:(NSURL *)URL;
- (void)_loadDataSource:(WebDataSource *)dataSource withLoadType:(WebFrameLoadType)type formState:(WebFormState *)formState;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index ae014a6..d57213c 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -979,12 +979,12 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
return _private->bridge;
}
-- (void)_handleUnimplementablePolicy:(WebPolicyAction)policy errorCode:(int)code forURL:(NSURL *)URL
+- (void)_handleUnimplementablePolicyWithErrorCode:(int)code forURL:(NSURL *)URL
{
WebError *error = [WebError errorWithCode:code
inDomain:WebErrorDomainWebKit
failingURL:[URL absoluteString]];
- [[[self controller] _policyDelegateForwarder] unableToImplementPolicy:policy error:error forURL:URL inFrame:self];
+ [[[self controller] _policyDelegateForwarder] unableToImplementPolicyWithError:error inFrame:self];
}
- (void)_clearProvisionalDataSource
@@ -1340,11 +1340,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
case WebPolicyOpenURL:
if ([[request URL] isFileURL]) {
if (![[NSWorkspace sharedWorkspace] openFile:[[request URL] path]]) {
- [self _handleUnimplementablePolicy:policy errorCode:WebKitErrorCannotFindApplicationForFile forURL:[request URL]];
+ [self _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotFindApplicationForFile forURL:[request URL]];
}
} else {
if (![[NSWorkspace sharedWorkspace] openURL:[request URL]]) {
- [self _handleUnimplementablePolicy:policy errorCode:WebKitErrorCannotFindApplicationForURL forURL:[request URL]];
+ [self _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotFindApplicationForURL forURL:[request URL]];
}
}
break;
@@ -1362,12 +1362,12 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[NSException raise:NSInvalidArgumentException
format:@"clickPolicyForElement:button:modifierFlags: returned an invalid WebClickPolicy"];
} else if (![[NSWorkspace sharedWorkspace] selectFile:[[request URL] path] inFileViewerRootedAtPath:@""]) {
- [self _handleUnimplementablePolicy:policy errorCode:WebKitErrorFinderCannotOpenDirectory forURL:[request URL]];
+ [self _handleUnimplementablePolicyWithErrorCode:WebKitErrorFinderCannotOpenDirectory forURL:[request URL]];
}
break;
case WebPolicyUse:
if (![WebResource canInitWithRequest:request]) {
- [self _handleUnimplementablePolicy:policy errorCode:WebKitErrorCannotShowURL forURL:[request URL]];
+ [self _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowURL forURL:[request URL]];
} else {
shouldContinue = YES;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 76886cb..411ea7b 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -173,7 +173,7 @@
switch (contentPolicy) {
case WebPolicyShow:
if (![WebController canShowMIMEType:[r contentType]]) {
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
[self stopLoadingForPolicyChange];
return;
}
@@ -213,11 +213,11 @@
case WebPolicyOpenURL:
if ([[req URL] isFileURL]) {
if(![[NSWorkspace sharedWorkspace] openFile:[[req URL] path]]){
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorCannotFindApplicationForFile forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotFindApplicationForFile forURL:[req URL]];
}
} else {
if(![[NSWorkspace sharedWorkspace] openURL:[req URL]]){
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorCannotFindApplicationForURL forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotFindApplicationForURL forURL:[req URL]];
}
}
@@ -229,7 +229,7 @@
if (![[req URL] isFileURL]) {
ERROR("contentPolicyForMIMEType:andRequest:inFrame: returned an invalid content policy.");
} else if (![[NSWorkspace sharedWorkspace] selectFile:[[req URL] path] inFileViewerRootedAtPath:@""]) {
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorFinderCannotOpenDirectory forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorFinderCannotOpenDirectory forURL:[req URL]];
}
[self stopLoadingForPolicyChange];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 76886cb..411ea7b 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -173,7 +173,7 @@
switch (contentPolicy) {
case WebPolicyShow:
if (![WebController canShowMIMEType:[r contentType]]) {
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
[self stopLoadingForPolicyChange];
return;
}
@@ -213,11 +213,11 @@
case WebPolicyOpenURL:
if ([[req URL] isFileURL]) {
if(![[NSWorkspace sharedWorkspace] openFile:[[req URL] path]]){
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorCannotFindApplicationForFile forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotFindApplicationForFile forURL:[req URL]];
}
} else {
if(![[NSWorkspace sharedWorkspace] openURL:[req URL]]){
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorCannotFindApplicationForURL forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotFindApplicationForURL forURL:[req URL]];
}
}
@@ -229,7 +229,7 @@
if (![[req URL] isFileURL]) {
ERROR("contentPolicyForMIMEType:andRequest:inFrame: returned an invalid content policy.");
} else if (![[NSWorkspace sharedWorkspace] selectFile:[[req URL] path] inFileViewerRootedAtPath:@""]) {
- [[dataSource webFrame] _handleUnimplementablePolicy:contentPolicy errorCode:WebKitErrorFinderCannotOpenDirectory forURL:[req URL]];
+ [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorFinderCannotOpenDirectory forURL:[req URL]];
}
[self stopLoadingForPolicyChange];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index c384f79..46fdad5 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -137,6 +137,6 @@ typedef enum {
@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)unableToImplementPolicy:(WebPolicyAction)policy error:(WebError *)error forURL:(NSURL *)URL inFrame:(WebFrame *)frame;
+- (void)unableToImplementPolicyWithError:(WebError *)error inFrame:(WebFrame *)frame;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list