[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 0a0d1a76cf8ebe915e0c4ada01898f2f9bdb9e7f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 9 01:54:43 2003 +0000

            Fixed 3252460.  *** Public API Change ***
            Added title method to WebDocumentRepresentation.
    
            Fixed 3250352.  Check that delegate implements method.
    
            Reviewed by hyatt.
    
            * WebView.subproj/WebDataSource.m:
            (-[WebDataSource pageTitle]):
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _startLoading:]):
            (-[WebDataSource _title]):
            * WebView.subproj/WebDocument.h:
            * WebView.subproj/WebHTMLRepresentation.m:
            (-[WebHTMLRepresentation title]):
            * WebView.subproj/WebImageRepresentation.m:
            (-[WebImageRepresentation title]):
            * WebView.subproj/WebNetscapePluginRepresentation.m:
            (-[WebNetscapePluginRepresentation title]):
            * WebView.subproj/WebTextRepresentation.h:
            * WebView.subproj/WebTextRepresentation.m:
            (-[WebTextRepresentation dealloc]):
            (-[WebTextRepresentation setDataSource:]):
            (-[WebTextRepresentation title]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8195901..96970f7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,31 @@
+2003-05-08  Richard Williamson   <rjw at apple.com>
+
+        Fixed 3252460.  *** Public API Change ***
+        Added title method to WebDocumentRepresentation.
+        
+        Fixed 3250352.  Check that delegate implements method.
+        
+        Reviewed by hyatt.
+
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource pageTitle]):
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _startLoading:]):
+        (-[WebDataSource _title]):
+        * WebView.subproj/WebDocument.h:
+        * WebView.subproj/WebHTMLRepresentation.m:
+        (-[WebHTMLRepresentation title]):
+        * WebView.subproj/WebImageRepresentation.m:
+        (-[WebImageRepresentation title]):
+        * WebView.subproj/WebNetscapePluginRepresentation.m:
+        (-[WebNetscapePluginRepresentation title]):
+        * WebView.subproj/WebTextRepresentation.h:
+        * WebView.subproj/WebTextRepresentation.m:
+        (-[WebTextRepresentation dealloc]):
+        (-[WebTextRepresentation setDataSource:]):
+        (-[WebTextRepresentation title]):
+
 2003-05-08  Darin Adler  <darin at apple.com>
 
         * WebKit.pbproj/project.pbxproj: Fixed paths for non-Panther builds.
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
index ebf18e4..ddbc9f4 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginRepresentation.m
@@ -9,6 +9,7 @@
 #import <WebKit/WebNetscapePluginDocumentView.h>
 #import <WebKit/WebNetscapePluginRepresentation.h>
 
+#import <WebFoundation/NSURLResponse.h>
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebNSErrorExtras.h>
 
@@ -93,6 +94,11 @@
     return nil;
 }
 
+- (NSString *)title
+{
+    return [[[_dataSource response] URL] absoluteString];
+}
+
 - (void)redeliverStream
 {
     if (_dataSource && [self isPluginViewStarted]) {
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 9360af7..c1d2d6b 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -128,7 +128,7 @@
 // Returns nil or the page title.
 - (NSString *)pageTitle
 {
-    return _private->pageTitle;
+    return [[self representation] title];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 819e269..3b9c83a 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -179,4 +179,10 @@
 */
 - (NSString *)documentSource;
 
+/*!
+    @method title
+    @result Return the title for the document.
+*/
+- (NSString *)title;
+
 @end
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index abc2e23..5b8654e 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -86,6 +86,10 @@
     return [WebBridge stringWithData:[_private->dataSource data] textEncoding:[_private->bridge textEncoding]];
 }
 
+- (NSString *)title
+{
+    return [_private->dataSource _title];
+}
 
 - (id<WebDOMDocument>)DOMDocument
 {
diff --git a/WebKit/WebView.subproj/WebImageRepresentation.m b/WebKit/WebView.subproj/WebImageRepresentation.m
index f98d5cb..007b8f0 100644
--- a/WebKit/WebView.subproj/WebImageRepresentation.m
+++ b/WebKit/WebView.subproj/WebImageRepresentation.m
@@ -77,5 +77,9 @@
     return nil;
 }
 
+- (NSString *)title
+{
+    return [URL absoluteString];
+}
 
 @end
diff --git a/WebKit/WebView.subproj/WebTextRepresentation.m b/WebKit/WebView.subproj/WebTextRepresentation.m
index f896572..86222ee 100644
--- a/WebKit/WebView.subproj/WebTextRepresentation.m
+++ b/WebKit/WebView.subproj/WebTextRepresentation.m
@@ -18,11 +18,14 @@
 - (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){
@@ -65,4 +68,10 @@
     return RTFSource;
 }
 
+- (NSString *)title
+{
+    return [URL absoluteString];
+}
+
+
 @end

-- 
WebKit Debian packaging