[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 06:49:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1ff051d1f1806f913720f2ace7fc6f4c21d99a8f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 14 23:27:17 2002 +0000
WebFoundation:
- Added new method that corrects a filename's extension based on its MIME type.
* Misc.subproj/WebFileTypeMappings.h:
* Misc.subproj/WebFileTypeMappings.m:
(-[WebFileTypeMappings filenameByCorrectingExtensionOfFilename:withMIMEType:]): if the extension does not correspond with the MIME type, correct it using the preferred MIME type.
WebKit:
- Cleaned up download handler and download progress delegate interactions.
- Got rid of error suppression junk.
- Only send 1 final message to the download progress delegate
* WebView.subproj/WebMainResourceClient.h:
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient receivedError:forHandle:]): no error suppression
(-[WebMainResourceClient didCancelWithHandle:]): ignore cancel errors because 1 download error is enough
(-[WebMainResourceClient handleDidFinishLoading:]): don't send the special and odd final message to the download progress delegate
(-[WebMainResourceClient handle:didReceiveData:]): no error suppression
(-[WebMainResourceClient handle:didFailLoadingWithError:]): ignore cancel errors because 1 download error is enough
WebBrowser:
- Correct extensions of filenames of downloaded files based on MIME type. This fixes issues with files that have random extensions and thus not claimed by any application.
- Cleaned up DownloadMonitor. Got rid of bottle-neck progress method that caused much confusion and bugs.
* BrowserWebController.m:
(-[BrowserWebController contentPolicyForMIMEType:URL:inFrame:]): call [WebFileTypeMappings filenameByCorrectingExtensionOfFilename:withMIMEType:]
* DownloadMonitor.m:
(-[DownloadMonitor _entryForDataSource:]): renamed
(-[DownloadMonitor _entryForView:]): renamed
(-[DownloadMonitor resourceRequest:didReceiveResponse:fromDataSource:]): create new download entry
(-[DownloadMonitor resourceRequest:didReceiveContentLength:fromDataSource:]): increment progress of download entry
(-[DownloadMonitor resourceRequest:didFinishLoadingFromDataSource:]): setCompleted on the download entry
(-[DownloadMonitor resourceRequest:didFailLoadingWithError:fromDataSource:]): set error and setCompleted on the download entry
* DownloadProgressEntry.h:
* DownloadProgressEntry.m:
(-[DownloadProgressEntry awakeFromNib]): progress bar should be determinate by default
(-[DownloadProgressEntry setCompleted]): replaces _cleanUpIfComplete, have the DownloadMonitor tell us when we're done.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2319 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3f6a59e..c3d6b31 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-10-14 Chris Blumenberg <cblu at apple.com>
+
+ - Cleaned up download handler and download progress delegate interactions.
+ - Got rid of error suppression junk.
+ - Only send 1 final message to the download progress delegate
+
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient receivedError:forHandle:]): no error suppression
+ (-[WebMainResourceClient didCancelWithHandle:]): ignore cancel errors because 1 download error is enough
+ (-[WebMainResourceClient handleDidFinishLoading:]): don't send the special and odd final message to the download progress delegate
+ (-[WebMainResourceClient handle:didReceiveData:]): no error suppression
+ (-[WebMainResourceClient handle:didFailLoadingWithError:]): ignore cancel errors because 1 download error is enough
+
2002-10-14 Darin Adler <darin at apple.com>
* Bookmarks.subproj/WebBookmark.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 3f6a59e..c3d6b31 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-10-14 Chris Blumenberg <cblu at apple.com>
+
+ - Cleaned up download handler and download progress delegate interactions.
+ - Got rid of error suppression junk.
+ - Only send 1 final message to the download progress delegate
+
+ * WebView.subproj/WebMainResourceClient.h:
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient receivedError:forHandle:]): no error suppression
+ (-[WebMainResourceClient didCancelWithHandle:]): ignore cancel errors because 1 download error is enough
+ (-[WebMainResourceClient handleDidFinishLoading:]): don't send the special and odd final message to the download progress delegate
+ (-[WebMainResourceClient handle:didReceiveData:]): no error suppression
+ (-[WebMainResourceClient handle:didFailLoadingWithError:]): ignore cancel errors because 1 download error is enough
+
2002-10-14 Darin Adler <darin at apple.com>
* Bookmarks.subproj/WebBookmark.m:
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.h b/WebKit/WebView.subproj/WebMainResourceClient.h
index 26fb99f..912b4c4 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.h
+++ b/WebKit/WebView.subproj/WebMainResourceClient.h
@@ -23,7 +23,6 @@
{
NSURL *currentURL;
WebDataSource *dataSource;
- BOOL suppressErrors;
WebDownloadHandler *downloadHandler;
// Both of these delegates are retained by the client.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 66815fe..b3215a1 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -103,11 +103,7 @@
}
- (void)receivedError:(WebError *)error forHandle:(WebResourceHandle *)handle
-{
- if(suppressErrors){
- return;
- }
-
+{
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
if (contentAction == WebContentPolicySaveAndOpenExternally || contentAction == WebContentPolicySave) {
@@ -137,10 +133,7 @@
[error release];
if (downloadHandler) {
- WebError *downloadError = [downloadHandler cancel];
- if(downloadError) {
- [self receivedError:downloadError forHandle:handle];
- }
+ [downloadHandler cancel];
[downloadHandler release];
downloadHandler = nil;
}
@@ -172,22 +165,24 @@
WebError *downloadError = [downloadHandler finishedLoading];
if (downloadError) {
[self receivedError:downloadError forHandle:handle];
+ }else{
+ [downloadProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
}
[downloadHandler release];
downloadHandler = nil;
- [downloadProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
}
else {
[dataSource _finishedLoading];
[resourceProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
- }
- // Either send a final error message or a final progress message.
- WebError *nonTerminalError = [[dataSource response] error];
- if (nonTerminalError) {
- [self receivedError:nonTerminalError forHandle:handle];
- } else {
- [self receivedProgressWithHandle:handle complete:YES];
+ // FIXME: Please let Chris know if this is really necessary?
+ // Either send a final error message or a final progress message.
+ WebError *nonTerminalError = [[dataSource response] error];
+ if (nonTerminalError) {
+ [self receivedError:nonTerminalError forHandle:handle];
+ } else {
+ [self receivedProgressWithHandle:handle complete:YES];
+ }
}
[self didStopLoading];
@@ -298,10 +293,6 @@
if (downloadError) {
[self receivedError:downloadError forHandle:handle];
-
- // Supress errors because we don't want to confuse the client with
- // the cancel error that will follow after cancel.
- suppressErrors = YES;
[handle cancel];
}
@@ -321,10 +312,7 @@
[self receivedError:result forHandle:handle];
if (downloadHandler) {
- WebError *downloadError = [downloadHandler cancel];
- if (downloadError) {
- [self receivedError:downloadError forHandle:handle];
- }
+ [downloadHandler cancel];
[downloadHandler release];
downloadHandler = nil;
}
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.h b/WebKit/WebView.subproj/WebMainResourceLoader.h
index 26fb99f..912b4c4 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.h
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.h
@@ -23,7 +23,6 @@
{
NSURL *currentURL;
WebDataSource *dataSource;
- BOOL suppressErrors;
WebDownloadHandler *downloadHandler;
// Both of these delegates are retained by the client.
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 66815fe..b3215a1 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -103,11 +103,7 @@
}
- (void)receivedError:(WebError *)error forHandle:(WebResourceHandle *)handle
-{
- if(suppressErrors){
- return;
- }
-
+{
WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
if (contentAction == WebContentPolicySaveAndOpenExternally || contentAction == WebContentPolicySave) {
@@ -137,10 +133,7 @@
[error release];
if (downloadHandler) {
- WebError *downloadError = [downloadHandler cancel];
- if(downloadError) {
- [self receivedError:downloadError forHandle:handle];
- }
+ [downloadHandler cancel];
[downloadHandler release];
downloadHandler = nil;
}
@@ -172,22 +165,24 @@
WebError *downloadError = [downloadHandler finishedLoading];
if (downloadError) {
[self receivedError:downloadError forHandle:handle];
+ }else{
+ [downloadProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
}
[downloadHandler release];
downloadHandler = nil;
- [downloadProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
}
else {
[dataSource _finishedLoading];
[resourceProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
- }
- // Either send a final error message or a final progress message.
- WebError *nonTerminalError = [[dataSource response] error];
- if (nonTerminalError) {
- [self receivedError:nonTerminalError forHandle:handle];
- } else {
- [self receivedProgressWithHandle:handle complete:YES];
+ // FIXME: Please let Chris know if this is really necessary?
+ // Either send a final error message or a final progress message.
+ WebError *nonTerminalError = [[dataSource response] error];
+ if (nonTerminalError) {
+ [self receivedError:nonTerminalError forHandle:handle];
+ } else {
+ [self receivedProgressWithHandle:handle complete:YES];
+ }
}
[self didStopLoading];
@@ -298,10 +293,6 @@
if (downloadError) {
[self receivedError:downloadError forHandle:handle];
-
- // Supress errors because we don't want to confuse the client with
- // the cancel error that will follow after cancel.
- suppressErrors = YES;
[handle cancel];
}
@@ -321,10 +312,7 @@
[self receivedError:result forHandle:handle];
if (downloadHandler) {
- WebError *downloadError = [downloadHandler cancel];
- if (downloadError) {
- [self receivedError:downloadError forHandle:handle];
- }
+ [downloadHandler cancel];
[downloadHandler release];
downloadHandler = nil;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list