[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 14587fcfe49caa62adf86426560c89d1985158c3
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 17 20:29:13 2002 +0000

    WebBrowser:
            Implemented save as.
    
            * BrowserDocument.m:
            (-[BrowserDocument dataRepresentationOfType:]): return main
            data source's data
    
            (-[BrowserDocument fileType]): added. Return [dataSource fileType]
            (-[BrowserDocument _isDocumentHTML]): removed obsolete comments.
            * WebBrowser.pbproj/project.pbxproj:
    
    WebKit:
            * WebView.subproj/IFWebDataSource.h:
            * WebView.subproj/IFWebDataSource.mm:
            (-[IFWebDataSource contentType]): no changes
            (-[IFWebDataSource fileType]): added. Returns extension based on MIME.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1392 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ba96fdb..92aeb33 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-17  Chris Blumenberg  <cblu at apple.com>
+
+	* WebView.subproj/IFWebDataSource.h:
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource contentType]): no changes
+	(-[IFWebDataSource fileType]): added. Returns extension based on MIME.
+
 2002-06-17  Richard Williamson  <rjw at apple.com>
 
     Fixed www.2cpu.com regression.  QWidget::_displayRect was displaying the wrong view.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ba96fdb..92aeb33 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-06-17  Chris Blumenberg  <cblu at apple.com>
+
+	* WebView.subproj/IFWebDataSource.h:
+	* WebView.subproj/IFWebDataSource.mm:
+	(-[IFWebDataSource contentType]): no changes
+	(-[IFWebDataSource fileType]): added. Returns extension based on MIME.
+
 2002-06-17  Richard Williamson  <rjw at apple.com>
 
     Fixed www.2cpu.com regression.  QWidget::_displayRect was displaying the wrong view.
diff --git a/WebKit/WebView.subproj/IFWebDataSource.h b/WebKit/WebView.subproj/IFWebDataSource.h
index 89136cf..43cb9ba 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.h
+++ b/WebKit/WebView.subproj/IFWebDataSource.h
@@ -159,16 +159,16 @@
 
 - (IFContentPolicy)contentPolicy;
 
+// MIME type
 - (NSString *)contentType;
 
+// extension based on the MIME type 
+- (NSString *)fileType;
+
 - (NSString *)downloadPath;
 
-/*
-*/
 - (NSDictionary *)errors;
 
-/*
-*/
 - (IFError *)mainDocumentError;
 
 + (void) registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType;
diff --git a/WebKit/WebView.subproj/IFWebDataSource.mm b/WebKit/WebView.subproj/IFWebDataSource.mm
index 1ae87d6..7a035bf 100644
--- a/WebKit/WebView.subproj/IFWebDataSource.mm
+++ b/WebKit/WebView.subproj/IFWebDataSource.mm
@@ -13,6 +13,7 @@
 #import <WebKit/WebKitDebug.h>
 
 #import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/IFFileTypeMappings.h>
 
 #import <xml/dom_docimpl.h>
 
@@ -319,6 +320,11 @@
     return _private->contentType;
 }
 
+- (NSString *)fileType
+{
+    return [[IFFileTypeMappings sharedMappings] preferredExtensionForMIMEType:[self contentType]];
+}
+
 - (NSString *)downloadPath
 {
     return _private->downloadPath;
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 89136cf..43cb9ba 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -159,16 +159,16 @@
 
 - (IFContentPolicy)contentPolicy;
 
+// MIME type
 - (NSString *)contentType;
 
+// extension based on the MIME type 
+- (NSString *)fileType;
+
 - (NSString *)downloadPath;
 
-/*
-*/
 - (NSDictionary *)errors;
 
-/*
-*/
 - (IFError *)mainDocumentError;
 
 + (void) registerRepresentationClass:(Class)repClass forMIMEType:(NSString *)MIMEType;
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 1ae87d6..7a035bf 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -13,6 +13,7 @@
 #import <WebKit/WebKitDebug.h>
 
 #import <WebFoundation/WebFoundation.h>
+#import <WebFoundation/IFFileTypeMappings.h>
 
 #import <xml/dom_docimpl.h>
 
@@ -319,6 +320,11 @@
     return _private->contentType;
 }
 
+- (NSString *)fileType
+{
+    return [[IFFileTypeMappings sharedMappings] preferredExtensionForMIMEType:[self contentType]];
+}
+
 - (NSString *)downloadPath
 {
     return _private->downloadPath;

-- 
WebKit Debian packaging