[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:59:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f774070a865dfb2809ba19e7cfcc231f8df6e7d6
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 12 07:17:46 2002 +0000
WebKit:
Remove contentPolicy parameter from _downloadURL, and remove
remaining traces of path from policy object.
* WebView.subproj/WebControllerPolicyDelegate.h:
* WebView.subproj/WebControllerPolicyDelegate.m:
(-[WebPolicyPrivate dealloc]):
(+[WebURLPolicy webPolicyWithURLAction:]):
(+[WebFileURLPolicy webPolicyWithFileAction:]):
(+[WebContentPolicy webPolicyWithContentAction:]):
(+[WebClickPolicy webPolicyWithClickAction:]):
* WebView.subproj/WebControllerPolicyDelegatePrivate.h:
* WebView.subproj/WebControllerPrivate.h:
* WebView.subproj/WebControllerPrivate.m:
(-[WebController _downloadURL:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate downloadURL:]):
* WebView.subproj/WebDefaultPolicyDelegate.m:
(-[WebDefaultPolicyDelegate clickPolicyForAction:andRequest:inFrame:]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _continueAfterClickPolicyForEvent:request:]):
* WebView.subproj/WebHTMLView.m:
(-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]):
* WebView.subproj/WebImageView.m:
(-[WebImageView namesOfPromisedFilesDroppedAtDestination:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient handle:didReceiveResponse:]):
WebBrowser:
Don't pass path when making policy objects.
* BrowserWebController.m:
(-[BrowserWebController contentPolicyForResponse:andRequest:inFrame:]):
(-[BrowserWebController clickPolicyForAction:andRequest:inFrame:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8441fea..d2a3860 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,32 @@
+2002-11-11 Maciej Stachowiak <mjs at apple.com>
+
+ Remove contentPolicy parameter from _downloadURL, and remove
+ remaining traces of path from policy object.
+
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebControllerPolicyDelegate.m:
+ (-[WebPolicyPrivate dealloc]):
+ (+[WebURLPolicy webPolicyWithURLAction:]):
+ (+[WebFileURLPolicy webPolicyWithFileAction:]):
+ (+[WebContentPolicy webPolicyWithContentAction:]):
+ (+[WebClickPolicy webPolicyWithClickAction:]):
+ * WebView.subproj/WebControllerPolicyDelegatePrivate.h:
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _downloadURL:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate downloadURL:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate clickPolicyForAction:andRequest:inFrame:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView namesOfPromisedFilesDroppedAtDestination:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:didReceiveResponse:]):
+
2002-11-11 Darin Adler <darin at apple.com>
* Plugins.subproj/WebNetscapePluginPackage.m: (-[WebNetscapePluginPackage load]):
@@ -565,7 +594,6 @@
2002-11-06 Darin Adler <darin at apple.com>
->>>>>>> 1.1102
- added a BinHex decoder and did a little work on the MacBinary decoder
I'm not supposed to be working on this, but I didn't feel like doing "real" work.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8441fea..d2a3860 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,32 @@
+2002-11-11 Maciej Stachowiak <mjs at apple.com>
+
+ Remove contentPolicy parameter from _downloadURL, and remove
+ remaining traces of path from policy object.
+
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebControllerPolicyDelegate.m:
+ (-[WebPolicyPrivate dealloc]):
+ (+[WebURLPolicy webPolicyWithURLAction:]):
+ (+[WebFileURLPolicy webPolicyWithFileAction:]):
+ (+[WebContentPolicy webPolicyWithContentAction:]):
+ (+[WebClickPolicy webPolicyWithClickAction:]):
+ * WebView.subproj/WebControllerPolicyDelegatePrivate.h:
+ * WebView.subproj/WebControllerPrivate.h:
+ * WebView.subproj/WebControllerPrivate.m:
+ (-[WebController _downloadURL:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate downloadURL:]):
+ * WebView.subproj/WebDefaultPolicyDelegate.m:
+ (-[WebDefaultPolicyDelegate clickPolicyForAction:andRequest:inFrame:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+ * WebView.subproj/WebHTMLView.m:
+ (-[WebHTMLView namesOfPromisedFilesDroppedAtDestination:]):
+ * WebView.subproj/WebImageView.m:
+ (-[WebImageView namesOfPromisedFilesDroppedAtDestination:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient handle:didReceiveResponse:]):
+
2002-11-11 Darin Adler <darin at apple.com>
* Plugins.subproj/WebNetscapePluginPackage.m: (-[WebNetscapePluginPackage load]):
@@ -565,7 +594,6 @@
2002-11-06 Darin Adler <darin at apple.com>
->>>>>>> 1.1102
- added a BinHex decoder and did a little work on the MacBinary decoder
I'm not supposed to be working on this, but I didn't feel like doing "real" work.
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index f9bb2ee..1d2c928 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -42,7 +42,6 @@ extern NSString *WebActionModifierFlagsKey; // NSNumber (unsigned)
@constant WebPolicyRevealInFinder Reveal the file in the Finder.
@constant WebPolicySave Save the resource to disk.
@constant WebPolicyOpenURL Open the URL in another application.
- @constant WebPolicySaveAndOpen Save and open the resource in another application.
@constant WebPolicyOpenNewWindow Open the resource in another window.
@constant WebPolicyOpenNewWindowBehind Open the resource in another window behind this window.
@constant WebPolicyIgnore Do nothing with the resource.
@@ -53,7 +52,6 @@ typedef enum {
WebPolicyRevealInFinder,
WebPolicySave,
WebPolicyOpenURL,
- WebPolicySaveAndOpen,
WebPolicyOpenNewWindow,
WebPolicyOpenNewWindowBehind,
WebPolicyIgnore
@@ -134,12 +132,6 @@ typedef enum {
*/
- (WebPolicyAction)policyAction;
-/*!
- @method path
- @abstract The path for the saved file.
-*/
-- (NSString *)path;
-
@end
@@ -177,13 +169,11 @@ typedef enum {
*/
@interface WebContentPolicy : WebPolicy
/*!
- @method webPolicyWithContentAction:andPath:
+ @method webPolicyWithContentAction:
@abstract WebContentPolicy constructor
@param action The policy action of the WebContentPolicy.
- @param thePath Path to where the file should be saved. Only applicable for
- WebContentPolicySave WebContentAction.
*/
-+ webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath;
++ webPolicyWithContentAction: (WebContentAction)action;
@end
@@ -193,13 +183,11 @@ typedef enum {
*/
@interface WebClickPolicy : WebPolicy
/*!
- @method webPolicyWithClickAction:andPath:
+ @method webPolicyWithClickAction:
@abstract WebClickPolicy constructor
@param action The policy action of the WebClickPolicy.
- @param thePath Path to where the file should be saved. Only applicable for
- WebClickPolicySave WebClickAction.
*/
-+ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action;
@end
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.m b/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
index 1ab1115..be83a74 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.m
@@ -15,7 +15,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
{
@public
WebPolicyAction policyAction;
- NSString *path;
}
@end
@@ -23,7 +22,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
- (void)dealloc
{
- [path release];
[super dealloc];
}
@@ -31,12 +29,11 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
@implementation WebPolicy
-- initWithPolicyAction: (WebPolicyAction)action andPath:(NSString *)path;
+- initWithPolicyAction: (WebPolicyAction)action;
{
[super init];
_private = [[WebPolicyPrivate alloc] init];
_private->policyAction = action;
- _private->path = [path copy];
return self;
}
@@ -50,19 +47,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
return _private->policyAction;
}
-- (NSString *)path
-{
- return _private->path;
-}
-
-- (void)_setPath:(NSString *)path
-{
- NSString *copy = [path copy];
- [_private->path release];
- _private->path = copy;
-}
-
-
- (void)dealloc
{
[_private release];
@@ -75,7 +59,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
+ webPolicyWithURLAction: (WebURLAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@end
@@ -84,16 +68,16 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
+ webPolicyWithFileAction: (WebFileAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@end
@implementation WebContentPolicy
-+ webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath
++ webPolicyWithContentAction: (WebContentAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@@ -101,9 +85,9 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
@implementation WebClickPolicy
-+ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@end
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
index c8609b9..b54d72c 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegatePrivate.h
@@ -10,6 +10,5 @@
@interface WebPolicy (WebPrivate)
- (void)_setPolicyAction:(WebPolicyAction)policyAction;
-- (void)_setPath:(NSString *)path;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.h b/WebKit/WebView.subproj/WebControllerPrivate.h
index 35f3fa4..6bef8fd 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.h
+++ b/WebKit/WebView.subproj/WebControllerPrivate.h
@@ -51,7 +51,7 @@
- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
+ (NSString *)_MIMETypeForFile:(NSString *)path;
-- (void)_downloadURL:(NSURL *)URL withContentPolicy:(WebContentPolicy *)contentPolicy;
+- (void)_downloadURL:(NSURL *)URL;
- (BOOL)_defersCallbacks;
- (void)_setDefersCallbacks:(BOOL)defers;
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 07130c0..f08d769 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -186,7 +186,7 @@
return result;
}
-- (void)_downloadURL:(NSURL *)URL withContentPolicy:(WebContentPolicy *)contentPolicy
+- (void)_downloadURL:(NSURL *)URL
{
WebDataSource *dataSource = [[WebDataSource alloc] initWithURL:URL];
WebFrame *webFrame = [self mainFrame];
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 239d7ef..fa92ed7 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -113,7 +113,7 @@
{
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
WebController *controller = [webFrame controller];
- [controller _downloadURL:URL withContentPolicy:[WebContentPolicy webPolicyWithContentAction:WebContentPolicySave andPath:nil]];
+ [controller _downloadURL:URL];
}
- (void)openLinkInNewWindow:(id)sender
diff --git a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
index d97537b..5d95bb3 100644
--- a/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultPolicyDelegate.m
@@ -58,11 +58,10 @@
andRequest:(WebResourceRequest *)request
inFrame:(WebFrame *)frame;
{
- if([WebController canShowMIMEType:[response contentType]]){
- return [WebContentPolicy webPolicyWithContentAction: WebContentPolicyShow andPath:nil];
- }
- else{
- return [WebContentPolicy webPolicyWithContentAction: WebContentPolicyIgnore andPath:nil];
+ if ([WebController canShowMIMEType:[response contentType]]) {
+ return [WebContentPolicy webPolicyWithContentAction:WebContentPolicyShow];
+ } else {
+ return [WebContentPolicy webPolicyWithContentAction:WebContentPolicyIgnore];
}
}
@@ -76,7 +75,7 @@
andRequest:(WebResourceRequest *)request
inFrame:(WebFrame *)frame
{
- return [WebClickPolicy webPolicyWithClickAction:WebClickPolicyShow andPath:nil];
+ return [WebClickPolicy webPolicyWithClickAction:WebClickPolicyShow];
}
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index b39ab96..cf58b2a 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1029,8 +1029,7 @@ static const char * const stateNames[] = {
[controller _openNewWindowWithRequest:request behind:YES];
break;
case WebClickPolicySave:
- [controller _downloadURL:[request URL]
- withContentPolicy:[WebContentPolicy webPolicyWithContentAction:clickAction andPath:nil]];
+ [controller _downloadURL:[request URL]];
break;
case WebClickPolicyIgnore:
break;
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index df97f18..9110efa 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -761,10 +761,13 @@
}
NSString *filename = [[imageURL path] lastPathComponent];
- NSString *path = [[dropDestination path] stringByAppendingPathComponent:filename];
- [[self _controller] _downloadURL:imageURL
- withContentPolicy:[WebContentPolicy webPolicyWithContentAction:WebContentPolicySave andPath:path]];
+
+ // FIXME: need to respect the chosen path here
+ [[self _controller] _downloadURL:imageURL];
+#if 0
+ NSString *path = [[dropDestination path] stringByAppendingPathComponent:filename];
+#endif
return [NSArray arrayWithObject:filename];
}
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index b1691e0..62571d7 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -199,11 +199,12 @@
{
NSURL *URL = [representation URL];
NSString *filename = [[URL path] lastPathComponent];
- NSString *path = [[dropDestination path] stringByAppendingPathComponent:filename];
- [[self controller] _downloadURL:URL
- withContentPolicy:[WebContentPolicy webPolicyWithContentAction:WebContentPolicySave
- andPath:path]];
+ // FIXME: need to respect chosen path here
+#if 0
+ NSString *path = [[dropDestination path] stringByAppendingPathComponent:filename];
+#endif
+ [[self controller] _downloadURL:URL];
return [NSArray arrayWithObject:filename];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index df6cbbd..d38dbc4 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -148,7 +148,7 @@
andRequest:[dataSource request]
inFrame:[dataSource webFrame]];
} else {
- contentPolicy = [WebContentPolicy webPolicyWithContentAction:WebContentPolicySave andPath:nil];
+ contentPolicy = [WebContentPolicy webPolicyWithContentAction:WebContentPolicySave];
}
policyAction = [contentPolicy policyAction];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index df6cbbd..d38dbc4 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -148,7 +148,7 @@
andRequest:[dataSource request]
inFrame:[dataSource webFrame]];
} else {
- contentPolicy = [WebContentPolicy webPolicyWithContentAction:WebContentPolicySave andPath:nil];
+ contentPolicy = [WebContentPolicy webPolicyWithContentAction:WebContentPolicySave];
}
policyAction = [contentPolicy policyAction];
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index f9bb2ee..1d2c928 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -42,7 +42,6 @@ extern NSString *WebActionModifierFlagsKey; // NSNumber (unsigned)
@constant WebPolicyRevealInFinder Reveal the file in the Finder.
@constant WebPolicySave Save the resource to disk.
@constant WebPolicyOpenURL Open the URL in another application.
- @constant WebPolicySaveAndOpen Save and open the resource in another application.
@constant WebPolicyOpenNewWindow Open the resource in another window.
@constant WebPolicyOpenNewWindowBehind Open the resource in another window behind this window.
@constant WebPolicyIgnore Do nothing with the resource.
@@ -53,7 +52,6 @@ typedef enum {
WebPolicyRevealInFinder,
WebPolicySave,
WebPolicyOpenURL,
- WebPolicySaveAndOpen,
WebPolicyOpenNewWindow,
WebPolicyOpenNewWindowBehind,
WebPolicyIgnore
@@ -134,12 +132,6 @@ typedef enum {
*/
- (WebPolicyAction)policyAction;
-/*!
- @method path
- @abstract The path for the saved file.
-*/
-- (NSString *)path;
-
@end
@@ -177,13 +169,11 @@ typedef enum {
*/
@interface WebContentPolicy : WebPolicy
/*!
- @method webPolicyWithContentAction:andPath:
+ @method webPolicyWithContentAction:
@abstract WebContentPolicy constructor
@param action The policy action of the WebContentPolicy.
- @param thePath Path to where the file should be saved. Only applicable for
- WebContentPolicySave WebContentAction.
*/
-+ webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath;
++ webPolicyWithContentAction: (WebContentAction)action;
@end
@@ -193,13 +183,11 @@ typedef enum {
*/
@interface WebClickPolicy : WebPolicy
/*!
- @method webPolicyWithClickAction:andPath:
+ @method webPolicyWithClickAction:
@abstract WebClickPolicy constructor
@param action The policy action of the WebClickPolicy.
- @param thePath Path to where the file should be saved. Only applicable for
- WebClickPolicySave WebClickAction.
*/
-+ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action;
@end
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.m b/WebKit/WebView.subproj/WebPolicyDelegate.m
index 1ab1115..be83a74 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.m
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.m
@@ -15,7 +15,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
{
@public
WebPolicyAction policyAction;
- NSString *path;
}
@end
@@ -23,7 +22,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
- (void)dealloc
{
- [path release];
[super dealloc];
}
@@ -31,12 +29,11 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
@implementation WebPolicy
-- initWithPolicyAction: (WebPolicyAction)action andPath:(NSString *)path;
+- initWithPolicyAction: (WebPolicyAction)action;
{
[super init];
_private = [[WebPolicyPrivate alloc] init];
_private->policyAction = action;
- _private->path = [path copy];
return self;
}
@@ -50,19 +47,6 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
return _private->policyAction;
}
-- (NSString *)path
-{
- return _private->path;
-}
-
-- (void)_setPath:(NSString *)path
-{
- NSString *copy = [path copy];
- [_private->path release];
- _private->path = copy;
-}
-
-
- (void)dealloc
{
[_private release];
@@ -75,7 +59,7 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
+ webPolicyWithURLAction: (WebURLAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@end
@@ -84,16 +68,16 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
+ webPolicyWithFileAction: (WebFileAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:nil] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@end
@implementation WebContentPolicy
-+ webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath
++ webPolicyWithContentAction: (WebContentAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@@ -101,9 +85,9 @@ NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
@implementation WebClickPolicy
-+ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
++ webPolicyWithClickAction: (WebClickAction)action
{
- return [[[WebPolicy alloc] initWithPolicyAction:action andPath:thePath] autorelease];
+ return [[[WebPolicy alloc] initWithPolicyAction:action] autorelease];
}
@end
diff --git a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
index c8609b9..b54d72c 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegatePrivate.h
@@ -10,6 +10,5 @@
@interface WebPolicy (WebPrivate)
- (void)_setPolicyAction:(WebPolicyAction)policyAction;
-- (void)_setPath:(NSString *)path;
- at end
\ No newline at end of file
+ at end
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 35f3fa4..6bef8fd 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -51,7 +51,7 @@
- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource;
+ (NSString *)_MIMETypeForFile:(NSString *)path;
-- (void)_downloadURL:(NSURL *)URL withContentPolicy:(WebContentPolicy *)contentPolicy;
+- (void)_downloadURL:(NSURL *)URL;
- (BOOL)_defersCallbacks;
- (void)_setDefersCallbacks:(BOOL)defers;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 07130c0..f08d769 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -186,7 +186,7 @@
return result;
}
-- (void)_downloadURL:(NSURL *)URL withContentPolicy:(WebContentPolicy *)contentPolicy
+- (void)_downloadURL:(NSURL *)URL
{
WebDataSource *dataSource = [[WebDataSource alloc] initWithURL:URL];
WebFrame *webFrame = [self mainFrame];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list