Reviewed by Adam

        - fixed <rdar://problem/5103009> REGRESSION: Activity window shows blank name for untitled pages

        * WebView/WebHTMLRepresentation.mm:
        (-[WebHTMLRepresentation title]):
        return nil for empty string, to match old behavior

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@20934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 6013cf1051307c9fe519e1d62f47a17408199878..df5377a0f9b1bc3bde696308f50d1a0a7eca6368 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-18  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Adam
+
+        - fixed <rdar://problem/5103009> REGRESSION: Activity window shows blank name for untitled pages
+
+        * WebView/WebHTMLRepresentation.mm:
+        (-[WebHTMLRepresentation title]):
+        return nil for empty string, to match old behavior
+
 2007-04-17  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Tim Hatcher

diff --git a/WebKit/WebView/WebHTMLRepresentation.mm b/WebKit/WebView/WebHTMLRepresentation.mm
index 464b53a79ff3b6095c1b65c392ca21471ed1a810..c5a2ffe203fc9ed9d520acce8df287ff64974a88 100644 (file)
--- a/WebKit/WebView/WebHTMLRepresentation.mm
+++ b/WebKit/WebView/WebHTMLRepresentation.mm
@@ -259,7 +259,7 @@ static NSArray *concatenateArrays(NSArray *first, NSArray *second)
 
 - (NSString *)title
 {
-    return [_private->dataSource _documentLoader]->title();
+    return nsStringNilIfEmpty([_private->dataSource _documentLoader]->title());
 }
 
 - (DOMDocument *)DOMDocument