[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:31:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f7f797ec442a428838518451da67b3cd43171a98
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 24 22:56:52 2003 +0000
WebFoundation:
Reviewed by trey.
* types.plist: added text/qif (Quicken)
WebKit:
Fixed: 3155489 - Seed: PostScript files display instead of downloading, often as a blank page
Fixed: 3106251 - quicken file not downloaded, can't save manually
Reviewed by trey.
* WebView.subproj/WebDataSourcePrivate.m:
(+[WebDataSource _repTypes]): call [WebImageView supportedImageMIMETypes]
* WebView.subproj/WebFrameViewPrivate.m:
(+[WebFrameView _viewTypes]): call [WebImageView supportedImageMIMETypes]
* WebView.subproj/WebImageView.h:
* WebView.subproj/WebImageView.m:
(+[WebImageView initialize]): was -initialize (oops)
(+[WebImageView unsupportedImageMIMETypes]): new, AppKit images that we shouldn't display inline, includes ps and pdf
(+[WebImageView supportedImageMIMETypes]): new, was in WebViewPrivate
* WebView.subproj/WebTextView.h:
* WebView.subproj/WebTextView.m:
(+[WebTextView unsupportedTextMIMETypes]): renamed, added text/qif (quicken)
* WebView.subproj/WebView.m:
(+[WebView canShowMIMEType:]): call [WebTextView unsupportedTextMIMETypes]
* WebView.subproj/WebViewPrivate.h: removed _supportedImageMIMETypes
* WebView.subproj/WebViewPrivate.m: removed _supportedImageMIMETypes
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3908 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d2f56ed..dad474e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,30 @@
+2003-03-24 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: 3155489 - Seed: PostScript files display instead of downloading, often as a blank page
+ Fixed: 3106251 - quicken file not downloaded, can't save manually
+
+ Reviewed by trey.
+
+ * WebView.subproj/WebDataSourcePrivate.m:
+ (+[WebDataSource _repTypes]): call [WebImageView supportedImageMIMETypes]
+ * WebView.subproj/WebFrameViewPrivate.m:
+ (+[WebFrameView _viewTypes]): call [WebImageView supportedImageMIMETypes]
+ * WebView.subproj/WebImageView.h:
+ * WebView.subproj/WebImageView.m:
+ (+[WebImageView initialize]): was -initialize (oops)
+ (+[WebImageView unsupportedImageMIMETypes]): new, AppKit images that we shouldn't display inline, includes ps and pdf
+ (+[WebImageView supportedImageMIMETypes]): new, was in WebViewPrivate
+ * WebView.subproj/WebTextView.h:
+ * WebView.subproj/WebTextView.m:
+ (+[WebTextView unsupportedTextMIMETypes]): renamed, added text/qif (quicken)
+ * WebView.subproj/WebView.m:
+ (+[WebView canShowMIMEType:]): call [WebTextView unsupportedTextMIMETypes]
+ * WebView.subproj/WebViewPrivate.h: removed _supportedImageMIMETypes
+ * WebView.subproj/WebViewPrivate.m: removed _supportedImageMIMETypes
+
2003-03-24 Ken Kocienda <kocienda at apple.com>
- Reviewed by NOBODY (OOPS!).
+ Reviewed by hyatt.
Moved closer to target API for NSURLRequest. Merged in
final names for immutable and mutable versions of this
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 2698abb..edd3727 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -19,6 +19,7 @@
#import <WebKit/WebIconDatabasePrivate.h>
#import <WebKit/WebIconLoader.h>
#import <WebKit/WebImageRepresentation.h>
+#import <WebKit/WebImageView.h>
#import <WebKit/WebKitLogging.h>
#import <WebKit/WebLocationChangeDelegate.h>
#import <WebKit/WebMainResourceClient.h>
@@ -442,7 +443,7 @@
[WebTextRepresentation class], @"application/x-javascript",
nil];
- NSEnumerator *enumerator = [[WebView _supportedImageMIMETypes] objectEnumerator];
+ NSEnumerator *enumerator = [[WebImageView supportedImageMIMETypes] objectEnumerator];
NSString *mime;
while ((mime = [enumerator nextObject]) != nil) {
[repTypes setObject:[WebImageRepresentation class] forKey:mime];
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 8961574..3e46f13 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -256,7 +256,7 @@
[WebTextView class], @"application/x-javascript",
nil];
- NSEnumerator *enumerator = [[WebView _supportedImageMIMETypes] objectEnumerator];
+ NSEnumerator *enumerator = [[WebImageView supportedImageMIMETypes] objectEnumerator];
NSString *mime;
while ((mime = [enumerator nextObject]) != nil) {
[viewTypes setObject:[WebImageView class] forKey:mime];
diff --git a/WebKit/WebView.subproj/WebImageView.h b/WebKit/WebView.subproj/WebImageView.h
index 966220c..92a54d5 100644
--- a/WebKit/WebView.subproj/WebImageView.h
+++ b/WebKit/WebView.subproj/WebImageView.h
@@ -14,4 +14,7 @@
WebImageRepresentation *representation;
BOOL didSetFrame;
}
+
++ (NSArray *)supportedImageMIMETypes;
+
@end
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 4354316..214ad7c 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -15,14 +15,48 @@
#import <WebKit/WebViewPrivate.h>
#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebFileTypeMappings.h>
+
@implementation WebImageView
-- (void)initialize
++ (void)initialize
{
[NSApp registerServicesMenuSendTypes:[NSArray arrayWithObject:NSTIFFPboardType] returnTypes:nil];
}
++ (NSArray *)unsupportedImageMIMETypes
+{
+ return [NSArray arrayWithObjects:
+ @"application/pdf",
+ @"application/postscript",
+ nil];
+}
+
++ (NSArray *)supportedImageMIMETypes
+{
+ static NSArray *imageMIMETypes = nil;
+
+ if(!imageMIMETypes){
+ NSEnumerator *enumerator = [[NSImage imageFileTypes] objectEnumerator];
+ WebFileTypeMappings *mappings = [WebFileTypeMappings sharedMappings];
+ NSMutableSet *mimes = [NSMutableSet set];
+ NSString *type;
+
+ while ((type = [enumerator nextObject]) != nil) {
+ NSString *mime = [mappings MIMETypeForExtension:type];
+ if(mime && ![mime isEqualToString:@"application/octet-stream"] &&
+ ![[self unsupportedImageMIMETypes] containsObject:mime]){
+ [mimes addObject:mime];
+ }
+ }
+
+ imageMIMETypes = [[mimes allObjects] retain];
+ }
+
+ return imageMIMETypes;
+}
+
- (id)initWithFrame:(NSRect)frame
{
self = [super initWithFrame:frame];
diff --git a/WebKit/WebView.subproj/WebTextView.h b/WebKit/WebView.subproj/WebTextView.h
index 2d1dfa9..f25f1cf 100644
--- a/WebKit/WebView.subproj/WebTextView.h
+++ b/WebKit/WebView.subproj/WebTextView.h
@@ -14,7 +14,7 @@
{
}
-+ (NSArray *)unshowableMIMETypes;
++ (NSArray *)unsupportedTextMIMETypes;
- (void)setFixedWidthFont;
@end
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 991dee3..8efd1aa 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -17,13 +17,16 @@
@implementation WebTextView
-+ (NSArray *)unshowableMIMETypes
++ (NSArray *)unsupportedTextMIMETypes
{
return [NSArray arrayWithObjects:
- @"text/calendar",
+ @"text/calendar", // iCal
@"text/x-calendar",
- @"text/vcard",
- @"text/x-vcard", nil];
+ @"text/vcard", // vCard
+ @"text/x-vcard",
+ @"text/qif", // Quicken
+ @"text/x-qif",
+ nil];
}
- (id)initWithFrame:(NSRect)frame
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 4eebf4f..42b3306 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -28,7 +28,6 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSUserDefaultsExtras.h>
#import <WebFoundation/WebResource.h>
@@ -72,7 +71,7 @@ NSString *WebElementLinkTitleKey = @"WebElementLinkTitle";
if (viewClass && repClass) {
if (viewClass == [WebTextView class] &&
repClass == [WebTextRepresentation class] &&
- [[WebTextView unshowableMIMETypes] containsObject:MIMEType]) {
+ [[WebTextView unsupportedTextMIMETypes] containsObject:MIMEType]) {
return NO;
}
return YES;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.h b/WebKit/WebView.subproj/WebViewPrivate.h
index 2fd48f1..c218db2 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.h
+++ b/WebKit/WebView.subproj/WebViewPrivate.h
@@ -97,7 +97,6 @@ enum { NumUserAgentStringTypes = WinIE + 1 };
- (void)_mainReceivedBytesSoFar:(unsigned)bytesSoFar fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
- (void)_mainReceivedError:(WebError *)error fromDataSource:(WebDataSource *)dataSource complete:(BOOL)isComplete;
+ (NSString *)_MIMETypeForFile:(NSString *)path;
-+ (NSArray *)_supportedImageMIMETypes;
- (void)_downloadURL:(NSURL *)URL;
- (void)_downloadURL:(NSURL *)URL toDirectory:(NSString *)directoryPath;
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index d6cd5bb..f84fa76 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -216,29 +216,6 @@
return MIMEType;
}
-+ (NSArray *)_supportedImageMIMETypes
-{
- static NSArray *imageMIMETypes = nil;
-
- if(!imageMIMETypes){
- NSEnumerator *enumerator = [[NSImage imageFileTypes] objectEnumerator];
- WebFileTypeMappings *mappings = [WebFileTypeMappings sharedMappings];
- NSMutableSet *mimes = [NSMutableSet set];
- NSString *type;
-
- while ((type = [enumerator nextObject]) != nil) {
- NSString *mime = [mappings MIMETypeForExtension:type];
- if(mime && ![mime isEqualToString:@"application/octet-stream"] && ![mime isEqualToString:@"application/pdf"]){
- [mimes addObject:mime];
- }
- }
-
- imageMIMETypes = [[mimes allObjects] retain];
- }
-
- return imageMIMETypes;
-}
-
- (void)_downloadURL:(NSURL *)URL
{
[self _downloadURL:URL toDirectory:nil];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list