[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 97d8202aa7620cc5806f911aed9dd471c8acffeb
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 9 05:32:49 2003 +0000

            Make representations without intrinsic titles return nil for
            - (NSString *)title
    
            Reviewed by John.
    
            * Plugins.subproj/WebNetscapePluginRepresentation.m:
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebDataSourcePrivate.m:
            * WebView.subproj/WebImageRepresentation.m:
            * WebView.subproj/WebTextRepresentation.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 96970f7..444b6bb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-08  Richard Williamson  <rjw at apple.com>
+
+        Make representations without intrinsic titles return nil.
+        
+        Reviewed by John.
+
+        * Plugins.subproj/WebNetscapePluginRepresentation.m:
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+        * WebView.subproj/WebImageRepresentation.m:
+        * WebView.subproj/WebTextRepresentation.m:
+
 2003-05-08  Richard Williamson   <rjw at apple.com>
 
         Fixed 3252460.  *** Public API Change ***
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index ddbc9f4..4a0d718 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -96,7 +96,7 @@
 
 - (NSString *)title
 {
-    return [[[_dataSource response] URL] absoluteString];
+    return nil;
 }
 
 - (void)redeliverStream
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 39046c8..f857e8c 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -179,5 +179,6 @@
 - (void)_setWebFrame:(WebFrame *)frame;
 
 - (BOOL)_isDocumentHTML;
+- (NSString *)_title;
 
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 6b8495a..f15584f 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -310,6 +310,11 @@
     }
 }
 
+- (NSString *)_title
+{
+    return _private->pageTitle;
+}
+
 - (void)_setURL:(NSURL *)URL
 {
     NSMutableURLRequest *newRequest = [_private->request mutableCopy];
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index 007b8f0..1804ea5 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -79,7 +79,7 @@
 
 - (NSString *)title
 {
-    return [URL absoluteString];
+    return nil;
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index 86222ee..df79859 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -18,14 +18,11 @@
 - (void)dealloc
 {
     [RTFSource release];
-    [URL release];
     [super dealloc];
 }
 
 - (void)setDataSource:(WebDataSource *)dataSource
 {
-    URL = [[[dataSource request] URL] retain];
-
     // FIXME: This is broken. [dataSource data] is incomplete at this point.
     hasRTFSource = [[[dataSource response] MIMEType] isEqualToString:@"text/rtf"];
     if (hasRTFSource){
@@ -70,7 +67,7 @@
 
 - (NSString *)title
 {
-    return [URL absoluteString];
+    return nil;
 }
 
 

-- 
WebKit Debian packaging