Changeset 140793 in webkit

Timestamp:

Jan 25, 2013, 12:21:37 AM (12 years ago)

Author:

mitz@apple.com

Message:

WebNavigationData does not distinguish between an empty title and a missing title
​https://bugs.webkit.org/show_bug.cgi?id=107917

Reviewed by Andy Estes.

• WebCoreSupport/WebFrameLoaderClient.mm:

(nilOrNSString): Added this helper function.
(WebFrameLoaderClient::updateGlobalHistory): Initialize the WebNavigationData with a nil
title, rather than the empty string, if the document does not have a title.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebFrameLoaderClient.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-01-24  Dan Bernstein  <mitz@apple.com>
+
+        WebNavigationData does not distinguish between an empty title and a missing title
+        https://bugs.webkit.org/show_bug.cgi?id=107917
+
+        Reviewed by Andy Estes.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (nilOrNSString): Added this helper function.
+        (WebFrameLoaderClient::updateGlobalHistory): Initialize the WebNavigationData with a nil
+        title, rather than the empty string, if the document does not have a title.
+
 2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -852 +852 @@
 }
 
+static inline NSString *nilOrNSString(const String& string)
+{
+    if (string.isNull())
+        return nil;
+    return string;
+}
+
 void WebFrameLoaderClient::updateGlobalHistory()
 {
@@ -861 +868 @@
         if (implementations->navigatedFunc) {
             WebNavigationData *data = [[WebNavigationData alloc] initWithURLString:loader->urlForHistory()
-                                                                             title:loader->title().string()
+                                                                             title:nilOrNSString(loader->title().string())
                                                                    originalRequest:loader->originalRequestCopy().nsURLRequest()
                                                                           response:loader->response().nsURLResponse()