2007-01-29 Ada Chan <adachan@apple.com>

        Reviewed by Brady.

        Moved the update of the title of the current entry in the backforward list to WebCore.

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::didChangeTitle):
        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::setTitle):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2747fdca8a3b86cf02ad0bdddd7595e40ff6af0d..7f996fd5c9d78176f8f4e0c5b09d6ad87ae6d36d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-29  Ada Chan  <adachan@apple.com>
+
+        Reviewed by Brady.
+        
+        Moved the update of the title of the current entry in the backforward list to WebCore.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::didChangeTitle):
+
 2007-01-29  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 519969c27165f87fac3001ce55f4a0469ad0aab6..e539ad4001e30a00519588cf0fb9c6b831ba7321 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -4267,6 +4267,8 @@ void FrameLoader::didChangeTitle(DocumentLoader* loader)
     // The title doesn't get communicated to the WebView until we are committed.
     if (loader->isCommitted()) {
         // Must update the entries in the back-forward list too.
+        if (m_currentHistoryItem)
+            m_currentHistoryItem->setTitle(loader->title());
         // This must go through the WebFrame because it has the right notion of the current b/f item.
         m_client->setTitle(loader->title(), loader->urlForHistory());
         m_client->setMainFrameDocumentReady(true); // update observers with new DOMDocument

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 074bdafd3c40fdf7b570dff35a51c0b6257a7bfb..7602be051da1f763d2b2312bbed47ce3e4a29ad1 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-29  Ada Chan  <adachan@apple.com>
+
+        Reviewed by Brady.
+
+        Moved the update of the title of the current entry in the backforward list to WebCore.
+
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::setTitle):
+
 2007-01-29  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKit/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/WebCoreSupport/WebFrameLoaderClient.mm
index dc971c7314d76925474a948934d7ac27a03276e7..c5a73ff981766414111bc62a4d7ce3ee4fd71c92 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/WebCoreSupport/WebFrameLoaderClient.mm
@@ -914,8 +914,6 @@ void WebFrameLoaderClient::setTitle(const String& title, const KURL& URL)
         return;
     NSString *titleNSString = title;
     [[[WebHistory optionalSharedHistory] itemForURL:nsURL] setTitle:titleNSString];
-    if (HistoryItem* item = core(m_webFrame.get())->loader()->currentHistoryItem())
-        item->setTitle(title);
 }
 
 // The following 2 functions are copied from [NSHTTPURLProtocol _cachedResponsePassesValidityChecks] and modified for our needs.