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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit fbbf0dc6237c07b9b9a3940027c87d583f13287b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 30 01:13:07 2003 +0000

            API changes from final review meeting.
            Added textEncodingName method to WebDataSource.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebDataSource.h:
            * WebView.subproj/WebDataSource.m:
            (-[WebDataSource textEncodingName]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ab10ad7..b728c75 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-29  Richard Williamson   <rjw at apple.com>
+
+        API changes from final review meeting.
+        Added textEncodingName method to WebDataSource.
+        
+        Reviewed by Chris.
+
+        * WebView.subproj/WebDataSource.h:
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource textEncodingName]):
+
 2003-04-29  Chris Blumenberg  <cblu at apple.com>
 
         Updated to use the new NSURLDownload API.
diff --git a/WebKit/WebView.subproj/WebDataSource.h b/WebKit/WebView.subproj/WebDataSource.h
index 15c7c75..921bbe7 100644
--- a/WebKit/WebView.subproj/WebDataSource.h
+++ b/WebKit/WebView.subproj/WebDataSource.h
@@ -82,6 +82,13 @@
 - (NSURLResponse *)response;
 
 /*!
+    @method textEncodingName
+    @result Returns either the override encoding, as set on the WebView for this 
+    dataSource or the encoding from the response.
+*/
+- (NSString *)textEncodingName;
+
+/*!
     @method isLoading
     @discussion Returns YES if there are any pending loads.
 */
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 91932d3..9360af7 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -85,6 +85,16 @@
     return _private->response;
 }
 
+- (NSString *)textEncodingName
+{
+    NSString *textEncodingName = [self _overrideEncoding];
+
+    if(!textEncodingName){
+        textEncodingName = [[self response] textEncodingName];
+    }
+    return textEncodingName;
+}
+
 // Returns YES if there are any pending loads.
 - (BOOL)isLoading
 {

-- 
WebKit Debian packaging