[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:31 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2ad25724bfcbfe2a51cb1323016fb46342cfdf51
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 25 00:03:03 2003 +0000
WebFoundation:
Renamed - [NSURLResponse suggestedFilenameForSaving] to suggestedFilename and moved it to WebFoundation.
Reviewed by mjs.
* CacheLoader.subproj/NSURLResponse.h:
* CacheLoader.subproj/NSURLResponse.m:
(-[NSURLResponse suggestedFilename]):
(-[NSHTTPURLResponse suggestedFilename]):
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/WebNSURLExtras.h:
* Misc.subproj/WebNSURLExtras.m:
(-[NSURL _web_suggestedFilenameWithMIMEType:]):
WebKit:
Renamed - [NSURLResponse suggestedFilenameForSaving] to suggestedFilename and moved it to WebFoundation.
Reviewed by mjs.
* Downloads.subproj/WebDownload.m:
(-[WebDownload _createFileIfNecessary]):
* English.lproj/Localizable.strings:
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/WebNSURLResponseExtras.h: Removed.
* Misc.subproj/WebNSURLResponseExtras.m: Removed.
* Plugins.subproj/WebNullPluginView.m: include NSError to unbreak build.
* WebKit.pbproj/project.pbxproj:
WebBrowser:
Renamed - [NSURLResponse suggestedFilenameForSaving] to suggestedFilename and moved it to WebFoundation.
Reviewed by mjs.
* BrowserDocument.m:
(-[BrowserDocument displayName]):
* BrowserWebController.m:
* DownloadProgressEntry.m:
(-[DownloadProgressEntry filename]):
* English.lproj/StringsNotToBeLocalized.txt:
* HTMLSourceDocument.m:
(-[HTMLSourceDocument displayName]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4178 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 29ab15b..ff19f36 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,20 @@
2003-04-24 Chris Blumenberg <cblu at apple.com>
+ Renamed - [NSURLResponse suggestedFilenameForSaving] to suggestedFilename and moved it to WebFoundation.
+
+ Reviewed by mjs.
+
+ * Downloads.subproj/WebDownload.m:
+ (-[WebDownload _createFileIfNecessary]):
+ * English.lproj/Localizable.strings:
+ * English.lproj/StringsNotToBeLocalized.txt:
+ * Misc.subproj/WebNSURLResponseExtras.h: Removed.
+ * Misc.subproj/WebNSURLResponseExtras.m: Removed.
+ * Plugins.subproj/WebNullPluginView.m: include NSError to unbreak build.
+ * WebKit.pbproj/project.pbxproj:
+
+2003-04-24 Chris Blumenberg <cblu at apple.com>
+
Removed WebPluginError and instead added fields to the userInfo of NSError for plug-in specific errors.
Reviewed by rjw.
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 7f93af2..08e33f7 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -16,7 +16,6 @@
#import <WebKit/WebMacBinaryDecoder.h>
#import <WebKit/WebMainResourceClient.h>
#import <WebKit/WebNSWorkspaceExtras.h>
-#import <WebKit/WebNSURLResponseExtras.h>
#import <WebFoundation/WebNSErrorExtras.h>
#import <WebFoundation/WebNSFileManagerExtras.h>
@@ -445,7 +444,7 @@ static void DeleteCompletionCallback(ParmBlkPtr paramBlock);
NSString *filename = [[lastDecoder filename] _web_filenameByFixingIllegalCharacters];
if ([filename length] == 0) {
- filename = [_private->response suggestedFilenameForSaving];
+ filename = [_private->response suggestedFilename];
}
ASSERT(!_private->path);
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index d1f0168..a8190ea 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index e5ba342..d93fb0b 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -37,7 +37,6 @@
"AppleFontSmoothing"
"BP_CreatePluginMIMETypesPreferences"
"BufferTextDrawing"
-"Content-Disposition"
"Content-Length"
"Courier"
"DOCBASE"
@@ -113,7 +112,6 @@
"WebElementLinkTitle"
"WebElementLinkURL"
"WebElementTargetFrame"
-"WebKitErrorDomain"
"WebFrameLoadTypeBack"
"WebFrameLoadTypeForward"
"WebFrameLoadTypeIndexedBackForward"
@@ -151,6 +149,10 @@
"WebKitDefaultTextEncodingName"
"WebKitDisplayImagesKey"
"WebKitDocumentView"
+"WebKitErrorDomain"
+"WebKitErrorMIMETypeKey"
+"WebKitErrorPlugInNameKey"
+"WebKitErrorPlugInPageURLStringKey"
"WebKitFantasyFont"
"WebKitFixedFont"
"WebKitHistoryAgeInDaysLimit"
@@ -236,7 +238,6 @@
"text/calendar"
"text/directory"
"text/html"
-"text/plain"
"text/qif"
"text/rtf"
"text/vcard"
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index b56965d..e5ad50d 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -15,10 +15,8 @@
#import <WebKit/WebKitErrors.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPreferences.h>
-#import <WebKit/WebPlugInError.h>
#import <WebKit/WebPolicyDelegate.h>
#import <WebKit/WebResourceLoadDelegate.h>
-#import <WebKit/WebNSURLResponseExtras.h>
#import <WebKit/WebStandardPanels.h>
#import <WebKit/WebView.h>
#import <WebKit/WebWindowOperationsDelegate.h>
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.h b/WebKit/Misc.subproj/WebNSURLResponseExtras.h
deleted file mode 100644
index 5ee06b5..0000000
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- WebNSURLResponseExtras.h
- Copyright 2003, Apple, Inc. All rights reserved.
-
- Public header file.
-*/
-
-#import <WebFoundation/NSURLResponse.h>
-
- at interface NSURLResponse (WebNSURLResponseExtras)
-
-/*!
- @method suggestedFilenameForSaving
- @abstract Returns a suggested filename if the resource were saved to disk.
- @discussion The method first checks if the server has specified a filename using the
- content disposition header. If no valid filename is specified using that mechanism,
- this method checks the last path component of the URL. If no valid filename can be
- obtained using the last path component, this method uses the URL's host as the filename.
- If the URL's host can't be converted to a valid filename, the filename "unknown" is used.
- In mose cases, this method appends the proper file extension based on the MIME type.
- This method always returns a valid filename.
- @result A suggested filename to use if saving the resource to disk.
-*/
-- (NSString *)suggestedFilenameForSaving;
-
- at end
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.m b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
deleted file mode 100644
index ea6720d..0000000
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.m
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// WebNSURLResponseExtras.m
-// WebKit
-//
-// Created by Chris Blumenberg on Thu Jan 09 2003.
-// Copyright (c) 2003 Apple Inc. All rights reserved.
-//
-
-#import <WebKit/WebNSURLResponseExtras.h>
-
-#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebFileTypeMappings.h>
-#import <WebFoundation/WebLocalizableStrings.h>
-#import <WebFoundation/WebNSStringExtras.h>
-
- at interface NSURL (WebNSURLResponseInternalURLExtras)
-- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType;
- at end
-
- at implementation NSURLResponse (WebNSURLResponseExtras)
-
-- (NSString *)suggestedFilenameForSaving
-{
- ASSERT([self URL]);
-
- // Get the filename from the URL and the MIME type. Always returns something valid.
- return [[self URL] _web_suggestedFilenameForSavingWithMIMEType:[self MIMEType]];
-}
-
- at end
-
- at implementation NSHTTPURLResponse (WebNSURLResponseExtras)
-
-- (NSString *)suggestedFilenameForSaving
-{
- NSString *filename = nil;
-
- // Use the content disposition of the filename if present.
- NSString *contentDispositionHeader = [[self allHeaderFields] objectForKey:@"Content-Disposition"];
- filename = [contentDispositionHeader _web_fileNameFromContentDispositionHeader];
- filename = [filename _web_filenameByFixingIllegalCharacters];
-
- if ([filename length] == 0) {
- // Get the filename from the URL and the MIME type. Always returns something valid.
- filename = [super suggestedFilenameForSaving];
- }
-
- return filename;
-}
-
- at end
-
- at implementation NSURL (WebNSURLResponseInternalURLExtras)
-
-- (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType
-{
- // Get the filename from the URL. Try the lastPathComponent first.
- NSString *lastPathComponent = [[self path] lastPathComponent];
- NSString *filename = [lastPathComponent _web_filenameByFixingIllegalCharacters];
- NSString *extension = nil;
-
- if ([filename length] == 0 || [lastPathComponent isEqualToString:@"/"]) {
- // lastPathComponent is no good, try the host.
- filename = [[self host] _web_filenameByFixingIllegalCharacters];
- if ([filename length] == 0) {
- // Can't make a filename using this URL, use "unknown".
- filename = UI_STRING("unknown", "Unknown filename");
- }
- } else {
- // Save the extension for later correction. Only correct the extension of the lastPathComponent.
- // For example, if the filename ends up being the host, we wouldn't want to correct ".com" in "www.apple.com".
- extension = [filename pathExtension];
- }
-
- // If the type is known, check the extension and correct it if necessary.
- if (MIMEType && ![MIMEType isEqualToString:@"application/octet-stream"] && ![MIMEType isEqualToString:@"text/plain"]) {
- WebFileTypeMappings *mappings = [WebFileTypeMappings sharedMappings];
- NSArray *extensions = [mappings extensionsForMIMEType:MIMEType];
-
- if (![extension length] || (extensions && ![extensions containsObject:extension])) {
- // The extension doesn't match the MIME type. Correct this.
- NSString *correctExtension = [mappings preferredExtensionForMIMEType:MIMEType];
- if ([correctExtension length] != 0) {
- if ([extension length] != 0) {
- // Remove the incorrect extension.
- filename = [filename stringByDeletingPathExtension];
- }
-
- // Append the correct extension.
- filename = [filename stringByAppendingPathExtension:correctExtension];
- }
- }
- }
-
- return filename;
-}
-
- at end
\ No newline at end of file
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 6cf5dcf..211e599 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -6,12 +6,12 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameView.h>
-#import <WebKit/WebPlugInError.h>
#import <WebKit/WebNullPluginView.h>
#import <WebKit/WebNSViewExtras.h>
#import <WebKit/WebResourceLoadDelegate.h>
#import <WebKit/WebViewPrivate.h>
+#import <WebFoundation/NSError.h>
#import <WebFoundation/WebNSURLExtras.h>
static NSImage *image = nil;
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 16883a8..f9e733f 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -285,7 +285,6 @@
511D5554033FD51000CA2ACD,
516F297003A6C45A00CA2D3A,
832B2D1603B10990009CF105,
- 84A992C403CE696800CA2ACA,
8324709A03F32305003026AC,
2D36FD5F03F78F9E00A80166,
F7EBEEAF03F9DBA103CA0DE6,
@@ -405,7 +404,6 @@
35081DAB02B6D4E40ACA2ACA,
35081DAD02B6D4E40ACA2ACA,
832B2D1703B10990009CF105,
- 84A992C503CE696800CA2ACA,
2D81DAB503EB0B2D00A80166,
F7FE6303040C27B003CA0DE6,
F7FE6304040C27B103CA0DE6,
@@ -510,8 +508,6 @@
8398847B03426FB000BC5F5E,
ED2B2474033A2DA800C1A526,
ED2B2475033A2DA800C1A526,
- 84A992C203CE696800CA2ACA,
- 84A992C303CE696800CA2ACA,
F508946902B71D59018A9CD4,
F508946A02B71D59018A9CD4,
9345DDAE0365FB27008635CE,
@@ -2056,33 +2052,6 @@
path = WebPluginViewFactory.h;
refType = 4;
};
- 84A992C203CE696800CA2ACA = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebNSURLResponseExtras.h;
- refType = 4;
- };
- 84A992C303CE696800CA2ACA = {
- fileEncoding = 4;
- isa = PBXFileReference;
- path = WebNSURLResponseExtras.m;
- refType = 4;
- };
- 84A992C403CE696800CA2ACA = {
- fileRef = 84A992C203CE696800CA2ACA;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
- 84A992C503CE696800CA2ACA = {
- fileRef = 84A992C303CE696800CA2ACA;
- isa = PBXBuildFile;
- settings = {
- };
- };
84CA5F7E042685E800CA2ACA = {
fileEncoding = 4;
isa = PBXFileReference;
diff --git a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
index 6f7aa03..e73150c 100644
--- a/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultResourceLoadDelegate.m
@@ -10,7 +10,6 @@
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDefaultResourceLoadDelegate.h>
-#import <WebKit/WebPluginError.h>
#import <WebKit/WebView.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 863768a..6a70554 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -29,7 +29,6 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
-#import <WebKit/WebNSURLResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 863768a..6a70554 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -29,7 +29,6 @@
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebPolicyDelegatePrivate.h>
-#import <WebKit/WebNSURLResponseExtras.h>
#import <WebKit/WebStandardPanelsPrivate.h>
#import <WebKit/WebViewPrivate.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list