[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:57:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 24b8a9b55cee63379253818d722fd91d5701ab09
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 8 05:29:16 2002 +0000
WebKit:
Removed SaveAndOpenExternally policy.
* Downloads.subproj/WebDownloadHandler.m:
(-[WebDownloadHandler finishedLoading]):
* WebView.subproj/WebControllerPolicyDelegate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _continueAfterClickPolicyForEvent:request:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient receivedError:]):
(-[WebMainResourceClient handle:didReceiveResponse:]):
(-[WebMainResourceClient handleDidFinishLoading:]):
WebBrowser:
Removed all uses of SaveAndOpenExternally policy.
* BrowserDocument.m:
(-[BrowserDocument _stopNonDownloadingDataSource:]):
* BrowserWebController.m:
(-[BrowserWebController contentPolicyForResponse:andRequest:inFrame:withContentPolicy:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2595 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 524a69d..1c6fc65 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-11-07 Maciej Stachowiak <mjs at apple.com>
+
+ Removed SaveAndOpenExternally policy.
+
+ * Downloads.subproj/WebDownloadHandler.m:
+ (-[WebDownloadHandler finishedLoading]):
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient receivedError:]):
+ (-[WebMainResourceClient handle:didReceiveResponse:]):
+ (-[WebMainResourceClient handleDidFinishLoading:]):
+
2002-11-07 Chris Blumenberg <cblu at apple.com>
* WebKit.pbproj/project.pbxproj:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 524a69d..1c6fc65 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-11-07 Maciej Stachowiak <mjs at apple.com>
+
+ Removed SaveAndOpenExternally policy.
+
+ * Downloads.subproj/WebDownloadHandler.m:
+ (-[WebDownloadHandler finishedLoading]):
+ * WebView.subproj/WebControllerPolicyDelegate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _continueAfterClickPolicyForEvent:request:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient receivedError:]):
+ (-[WebMainResourceClient handle:didReceiveResponse:]):
+ (-[WebMainResourceClient handleDidFinishLoading:]):
+
2002-11-07 Chris Blumenberg <cblu at apple.com>
* WebKit.pbproj/project.pbxproj:
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index e261f8f..7df61e2 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -343,12 +343,6 @@
NSString *path = [[dataSource contentPolicy] path];
LOG(Download, "Download complete. Saved to: %s", [path cString]);
-
- if ([[dataSource contentPolicy] policyAction] == WebContentPolicySaveAndOpenExternally) {
- if (![[NSWorkspace sharedWorkspace] openFile:path]) {
- return [self errorWithCode:WebErrorCannotFindApplicationForFile];
- }
- }
return nil;
}
diff --git a/WebKit/Downloads.subproj/WebDownloadHandler.m b/WebKit/Downloads.subproj/WebDownloadHandler.m
index e261f8f..7df61e2 100644
--- a/WebKit/Downloads.subproj/WebDownloadHandler.m
+++ b/WebKit/Downloads.subproj/WebDownloadHandler.m
@@ -343,12 +343,6 @@
NSString *path = [[dataSource contentPolicy] path];
LOG(Download, "Download complete. Saved to: %s", [path cString]);
-
- if ([[dataSource contentPolicy] policyAction] == WebContentPolicySaveAndOpenExternally) {
- if (![[NSWorkspace sharedWorkspace] openFile:path]) {
- return [self errorWithCode:WebErrorCannotFindApplicationForFile];
- }
- }
return nil;
}
diff --git a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
index a676070..12d9d50 100644
--- a/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebControllerPolicyDelegate.h
@@ -65,7 +65,6 @@ typedef enum {
@constant WebClickPolicyOpenNewWindow Open the clicked URL in another window.
@constant WebClickPolicyOpenNewWindowBehind Open the clicked URL in another window behind this window.
@constant WebClickPolicySave Save the clicked URL to disk.
- @constant WebClickPolicySaveAndOpenExternally Save the clicked URL to disk and open the file in another application.
@constant WebClickPolicyIgnore Do nothing with the clicked URL.
*/
typedef enum {
@@ -74,7 +73,6 @@ typedef enum {
WebClickPolicyOpenNewWindow = WebPolicyOpenNewWindow,
WebClickPolicyOpenNewWindowBehind = WebPolicyOpenNewWindowBehind,
WebClickPolicySave = WebPolicySave,
- WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
WebClickPolicyIgnore = WebPolicyIgnore
} WebClickAction;
@@ -109,14 +107,12 @@ typedef enum {
@constant WebContentPolicyNone Unitialized state.
@constant WebContentPolicyShow Show the content in WebKit.
@constant WebContentPolicySave Save the content to disk.
- @constant WebContentPolicySaveAndOpenExternally Save the content to disk and open it in another application.
@constant WebContentPolicyIgnore Do nothing with the content.
*/
typedef enum {
WebContentPolicyNone = WebPolicyNone,
WebContentPolicyShow = WebPolicyUse,
WebContentPolicySave = WebPolicySave,
- WebContentPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
WebContentPolicyIgnore = WebPolicyIgnore
} WebContentAction;
@@ -185,7 +181,7 @@ typedef enum {
@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 and WebContentPolicySaveAndOpenExternally WebContentActions.
+ WebContentPolicySave WebContentAction.
*/
+ webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath;
@end
@@ -201,7 +197,7 @@ typedef enum {
@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 and WebClickPolicySaveAndOpenExternally WebClickActions.
+ WebClickPolicySave WebClickAction.
*/
+ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
@end
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 7a0f9ac..d2f7d9f 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -844,7 +844,6 @@ static const char * const stateNames[] = {
[controller _openNewWindowWithRequest:request behind:YES];
break;
case WebClickPolicySave:
- case WebClickPolicySaveAndOpenExternally:
[controller _downloadURL:[request URL]
withContentPolicy:[WebContentPolicy webPolicyWithContentAction:clickAction andPath:nil]];
break;
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 4b45280..e1d2e8e 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -68,7 +68,7 @@
{
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
- if (contentAction != WebContentPolicySaveAndOpenExternally && contentAction != WebContentPolicySave) {
+ if (contentAction != WebContentPolicySave) {
[[dataSource controller] _mainReceivedError:error fromDataSource:dataSource];
}
}
@@ -178,7 +178,6 @@
break;
case WebContentPolicySave:
- case WebContentPolicySaveAndOpenExternally:
{
[[dataSource webFrame] _setProvisionalDataSource:nil];
@@ -241,7 +240,7 @@
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
// Don't retain data for downloaded files
- if (contentAction != WebContentPolicySave && contentAction != WebContentPolicySaveAndOpenExternally) {
+ if (contentAction != WebContentPolicySave) {
[dataSource _setResourceData:resourceData];
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 4b45280..e1d2e8e 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -68,7 +68,7 @@
{
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
- if (contentAction != WebContentPolicySaveAndOpenExternally && contentAction != WebContentPolicySave) {
+ if (contentAction != WebContentPolicySave) {
[[dataSource controller] _mainReceivedError:error fromDataSource:dataSource];
}
}
@@ -178,7 +178,6 @@
break;
case WebContentPolicySave:
- case WebContentPolicySaveAndOpenExternally:
{
[[dataSource webFrame] _setProvisionalDataSource:nil];
@@ -241,7 +240,7 @@
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
// Don't retain data for downloaded files
- if (contentAction != WebContentPolicySave && contentAction != WebContentPolicySaveAndOpenExternally) {
+ if (contentAction != WebContentPolicySave) {
[dataSource _setResourceData:resourceData];
}
diff --git a/WebKit/WebView.subproj/WebPolicyDelegate.h b/WebKit/WebView.subproj/WebPolicyDelegate.h
index a676070..12d9d50 100644
--- a/WebKit/WebView.subproj/WebPolicyDelegate.h
+++ b/WebKit/WebView.subproj/WebPolicyDelegate.h
@@ -65,7 +65,6 @@ typedef enum {
@constant WebClickPolicyOpenNewWindow Open the clicked URL in another window.
@constant WebClickPolicyOpenNewWindowBehind Open the clicked URL in another window behind this window.
@constant WebClickPolicySave Save the clicked URL to disk.
- @constant WebClickPolicySaveAndOpenExternally Save the clicked URL to disk and open the file in another application.
@constant WebClickPolicyIgnore Do nothing with the clicked URL.
*/
typedef enum {
@@ -74,7 +73,6 @@ typedef enum {
WebClickPolicyOpenNewWindow = WebPolicyOpenNewWindow,
WebClickPolicyOpenNewWindowBehind = WebPolicyOpenNewWindowBehind,
WebClickPolicySave = WebPolicySave,
- WebClickPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
WebClickPolicyIgnore = WebPolicyIgnore
} WebClickAction;
@@ -109,14 +107,12 @@ typedef enum {
@constant WebContentPolicyNone Unitialized state.
@constant WebContentPolicyShow Show the content in WebKit.
@constant WebContentPolicySave Save the content to disk.
- @constant WebContentPolicySaveAndOpenExternally Save the content to disk and open it in another application.
@constant WebContentPolicyIgnore Do nothing with the content.
*/
typedef enum {
WebContentPolicyNone = WebPolicyNone,
WebContentPolicyShow = WebPolicyUse,
WebContentPolicySave = WebPolicySave,
- WebContentPolicySaveAndOpenExternally = WebPolicySaveAndOpen,
WebContentPolicyIgnore = WebPolicyIgnore
} WebContentAction;
@@ -185,7 +181,7 @@ typedef enum {
@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 and WebContentPolicySaveAndOpenExternally WebContentActions.
+ WebContentPolicySave WebContentAction.
*/
+ webPolicyWithContentAction: (WebContentAction)action andPath: (NSString *)thePath;
@end
@@ -201,7 +197,7 @@ typedef enum {
@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 and WebClickPolicySaveAndOpenExternally WebClickActions.
+ WebClickPolicySave WebClickAction.
*/
+ webPolicyWithClickAction: (WebClickAction)action andPath: (NSString *)thePath;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list