WebCore:
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Nov 2008 23:32:09 +0000 (23:32 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Nov 2008 23:32:09 +0000 (23:32 +0000)
2008-11-24  Darin Adler  <darin@apple.com>

        Reviewed by Dan Bernstein.

        - https://bugs.webkit.org/show_bug.cgi?id=22470
          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory

        * loader/EmptyClients.h:
        (WebCore::EmptyFrameLoaderClient::updateGlobalHistory): Remove argument.
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::updateHistoryForStandardLoad): Don't pass the URL.
        (WebCore::FrameLoader::updateHistoryForRedirectWithLockedHistory): Ditto.
        * loader/FrameLoaderClient.h: Remove argument.

WebKit/gtk:

2008-11-24  Darin Adler  <darin@apple.com>

        Reviewed by Dan Bernstein.

        - https://bugs.webkit.org/show_bug.cgi?id=22470
          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::updateGlobalHistory): Remove argument.
        * WebCoreSupport/FrameLoaderClientGtk.h: Ditto.

WebKit/mac:

2008-11-24  Darin Adler  <darin@apple.com>

        Reviewed by Dan Bernstein.

        - https://bugs.webkit.org/show_bug.cgi?id=22470
          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory

        * WebCoreSupport/WebFrameLoaderClient.h: Remove argument.
        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::updateGlobalHistory): Get the URL from the
        DocumentLoader, just as we do the title and the failure flag.

WebKit/qt:

2008-11-24  Darin Adler  <darin@apple.com>

        Reviewed by Dan Bernstein.

        - https://bugs.webkit.org/show_bug.cgi?id=22470
          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory

        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::updateGlobalHistory): Get the URL from the
        DocumentLoader.
        * WebCoreSupport/FrameLoaderClientQt.h: Remove argument.

WebKit/win:

2008-11-24  Darin Adler  <darin@apple.com>

        Reviewed by Dan Bernstein.

        - https://bugs.webkit.org/show_bug.cgi?id=22470
          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory

        * WebCoreSupport/WebFrameLoaderClient.cpp:
        (WebFrameLoaderClient::updateGlobalHistory): Get the URL from the
        DocumentLoader, just as we do the title and the failure flag.
        * WebCoreSupport/WebFrameLoaderClient.h: Remove argument.

WebKit/wx:

2008-11-24  Darin Adler  <darin@apple.com>

        Reviewed by Dan Bernstein.

        - https://bugs.webkit.org/show_bug.cgi?id=22470
          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory

        * WebKitSupport/FrameLoaderClientWx.cpp:
        (WebCore::FrameLoaderClientWx::updateGlobalHistory): Remove argument.
        * WebKitSupport/FrameLoaderClientWx.h: Ditto.

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

19 files changed:
WebCore/ChangeLog
WebCore/loader/EmptyClients.h
WebCore/loader/FrameLoader.cpp
WebCore/loader/FrameLoaderClient.h
WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
WebKit/mac/ChangeLog
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
WebKit/win/ChangeLog
WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
WebKit/wx/ChangeLog
WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

index aa73bfa..8951298 100644 (file)
@@ -1,3 +1,17 @@
+2008-11-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        - https://bugs.webkit.org/show_bug.cgi?id=22470
+          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyFrameLoaderClient::updateGlobalHistory): Remove argument.
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::updateHistoryForStandardLoad): Don't pass the URL.
+        (WebCore::FrameLoader::updateHistoryForRedirectWithLockedHistory): Ditto.
+        * loader/FrameLoaderClient.h: Remove argument.
+
 2008-11-24  Finnur Thorarinsson  <finnur.webkit@gmail.com>
 
         Reviewed by Darin Adler.
index 8cab747..10d520c 100644 (file)
@@ -248,7 +248,7 @@ public:
     virtual void transitionToCommittedFromCachedPage(CachedPage*) { }
     virtual void transitionToCommittedForNewPage() { }    
 
-    virtual void updateGlobalHistory(const KURL&) { }
+    virtual void updateGlobalHistory() { }
     virtual bool shouldGoToHistoryItem(HistoryItem*) const { return false; }
     virtual void saveViewStateToItem(HistoryItem*) { }
     virtual bool canCachePage() const { return false; }
index 2d07400..8ae6f23 100644 (file)
@@ -4558,7 +4558,7 @@ void FrameLoader::updateHistoryForStandardLoad()
         if (!historyURL.isEmpty()) {
             addBackForwardItemClippedAtTarget(true);
             if (!needPrivacy)
-                m_client->updateGlobalHistory(historyURL);
+                m_client->updateGlobalHistory();
         }
     } else if (documentLoader()->unreachableURL().isEmpty() && m_currentHistoryItem) {
         m_currentHistoryItem->setURL(documentLoader()->url());
@@ -4640,7 +4640,7 @@ void FrameLoader::updateHistoryForRedirectWithLockedHistory()
         if (!m_currentHistoryItem && !m_frame->tree()->parent()) {
             addBackForwardItemClippedAtTarget(true);
             if (!needPrivacy && !historyURL.isEmpty())
-                m_client->updateGlobalHistory(historyURL);
+                m_client->updateGlobalHistory();
         }
         if (m_currentHistoryItem) {
             m_currentHistoryItem->setURL(documentLoader()->url());
index 6d7471d..5966670 100644 (file)
@@ -147,7 +147,7 @@ namespace WebCore {
         virtual void committedLoad(DocumentLoader*, const char*, int) = 0;
         virtual void finishedLoading(DocumentLoader*) = 0;
         
-        virtual void updateGlobalHistory(const KURL&) = 0;
+        virtual void updateGlobalHistory() = 0;
         virtual bool shouldGoToHistoryItem(HistoryItem*) const = 0;
 
         virtual ResourceError cancelledError(const ResourceRequest&) = 0;
index 3056443..01e4bac 100644 (file)
@@ -1,3 +1,14 @@
+2008-11-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        - https://bugs.webkit.org/show_bug.cgi?id=22470
+          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::updateGlobalHistory): Remove argument.
+        * WebCoreSupport/FrameLoaderClientGtk.h: Ditto.
+
 2008-11-24  Christian Dywan  <christian@twotoasts.de>
 
         Reviewed by Holger Freyther.
index a582637..f94f396 100644 (file)
@@ -739,7 +739,7 @@ void FrameLoaderClient::startDownload(const ResourceRequest&)
     notImplemented();
 }
 
-void FrameLoaderClient::updateGlobalHistory(const KURL&)
+void FrameLoaderClient::updateGlobalHistory()
 {
     notImplemented();
 }
index 8f63b53..0738a29 100644 (file)
@@ -129,7 +129,7 @@ namespace WebKit {
         virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
         virtual void finishedLoading(WebCore::DocumentLoader*);
 
-        virtual void updateGlobalHistory(const WebCore::KURL&);
+        virtual void updateGlobalHistory();
         virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
 
         virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
index 7606308..6a27176 100644 (file)
@@ -2,6 +2,18 @@
 
         Reviewed by Dan Bernstein.
 
+        - https://bugs.webkit.org/show_bug.cgi?id=22470
+          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory
+
+        * WebCoreSupport/WebFrameLoaderClient.h: Remove argument.
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::updateGlobalHistory): Get the URL from the
+        DocumentLoader, just as we do the title and the failure flag.
+
+2008-11-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
         - finish https://bugs.webkit.org/show_bug.cgi?id=22295
           track which history items are from page load failures
 
index 2730765..0ba93f9 100644 (file)
@@ -136,7 +136,7 @@ private:
 
     virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
     virtual void finishedLoading(WebCore::DocumentLoader*);
-    virtual void updateGlobalHistory(const WebCore::KURL&);
+    virtual void updateGlobalHistory();
     virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
 
     virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
index 6a6dfef..520eae3 100644 (file)
@@ -715,12 +715,12 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* loader)
     [dataSource(loader) _finishedLoading];
 }
 
-void WebFrameLoaderClient::updateGlobalHistory(const KURL& url)
+void WebFrameLoaderClient::updateGlobalHistory()
 {
-    DocumentLoader* documentLoader = core(m_webFrame.get())->loader()->documentLoader();
-    ASSERT(url == documentLoader->urlForHistory());
-    const String& title = documentLoader->title();
-    bool wasFailure = documentLoader->urlForHistoryReflectsFailure();
+    DocumentLoader* loader = core(m_webFrame.get())->loader()->documentLoader();
+    const KURL& url = loader->urlForHistory();
+    const String& title = loader->title();
+    bool wasFailure = loader->urlForHistoryReflectsFailure();
     [[WebHistory optionalSharedHistory] _visitedURL:url withTitle:title wasFailure:wasFailure];
 }
 
index 813cb8e..477101b 100644 (file)
@@ -1,3 +1,15 @@
+2008-11-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        - https://bugs.webkit.org/show_bug.cgi?id=22470
+          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::updateGlobalHistory): Get the URL from the
+        DocumentLoader.
+        * WebCoreSupport/FrameLoaderClientQt.h: Remove argument.
+
 2008-11-24  Darin Fisher  <darin@chromium.org>
 
         Fix bustage.
index 39cdc39..eda5a01 100644 (file)
@@ -604,11 +604,11 @@ void FrameLoaderClientQt::registerForIconNotification(bool)
     notImplemented();
 }
 
-void FrameLoaderClientQt::updateGlobalHistory(const WebCore::KURL& url)
+void FrameLoaderClientQt::updateGlobalHistory()
 {
     QWebHistoryInterface *history = QWebHistoryInterface::defaultInterface();
     if (history)
-        history->addHistoryEntry(url.prettyURL());
+        history->addHistoryEntry(m_webFrame->loader()->documentLoader()->urlForHistory().prettyURL());
 }
 
 bool FrameLoaderClientQt::shouldGoToHistoryItem(WebCore::HistoryItem *item) const
index 0156412..ba6538d 100644 (file)
@@ -144,7 +144,7 @@ namespace WebCore {
         virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
         virtual void finishedLoading(DocumentLoader*);
 
-        virtual void updateGlobalHistory(const KURL&);
+        virtual void updateGlobalHistory();
         virtual bool shouldGoToHistoryItem(HistoryItem*) const;
 
         virtual ResourceError cancelledError(const ResourceRequest&);
index 048ebce..05b1ed3 100644 (file)
@@ -2,6 +2,18 @@
 
         Reviewed by Dan Bernstein.
 
+        - https://bugs.webkit.org/show_bug.cgi?id=22470
+          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::updateGlobalHistory): Get the URL from the
+        DocumentLoader, just as we do the title and the failure flag.
+        * WebCoreSupport/WebFrameLoaderClient.h: Remove argument.
+
+2008-11-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
         - finish https://bugs.webkit.org/show_bug.cgi?id=22295
           track which history items are from page load failures
 
index 8320905..c00ca69 100644 (file)
@@ -417,13 +417,13 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* loader)
     m_hasSentResponseToPlugin = false;
 }
 
-void WebFrameLoaderClient::updateGlobalHistory(const KURL& url)
+void WebFrameLoaderClient::updateGlobalHistory()
 {
     WebHistory* history = WebHistory::sharedHistory();
     if (!history)
         return;
     DocumentLoader* loader = core(m_webFrame)->loader()->documentLoader();
-    history->addItem(url, loader->title(), loader->urlForHistoryReflectsFailure());                 
+    history->addItem(loader->urlForHistory(), loader->title(), loader->urlForHistoryReflectsFailure());                 
 }
 
 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const
index b9fd027..bf735c6 100644 (file)
@@ -83,7 +83,7 @@ public:
     virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
     virtual void finishedLoading(WebCore::DocumentLoader*);
 
-    virtual void updateGlobalHistory(const WebCore::KURL&);
+    virtual void updateGlobalHistory();
     virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
 
     virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
index 84acd29..dc1ad66 100644 (file)
@@ -1,3 +1,14 @@
+2008-11-24  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        - https://bugs.webkit.org/show_bug.cgi?id=22470
+          remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory
+
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::updateGlobalHistory): Remove argument.
+        * WebKitSupport/FrameLoaderClientWx.h: Ditto.
+
 2008-11-21  Kevin Watters  <kevinwatters@gmail.com>
 
         Reviewed by Kevin Ollivier.
index 685da65..eaf5536 100644 (file)
@@ -529,7 +529,7 @@ void FrameLoaderClientWx::partClearedInBegin()
     notImplemented();
 }
 
-void FrameLoaderClientWx::updateGlobalHistory(const WebCore::KURL&)
+void FrameLoaderClientWx::updateGlobalHistory()
 {
     notImplemented();
 }
index 3b525b1..584854b 100644 (file)
@@ -149,7 +149,7 @@ namespace WebCore {
         virtual void transitionToCommittedFromCachedPage(WebCore::CachedPage*);
         virtual void transitionToCommittedForNewPage();
         
-        virtual void updateGlobalHistory(const KURL&);
+        virtual void updateGlobalHistory();
         virtual bool shouldGoToHistoryItem(HistoryItem*) const;
         virtual void saveScrollPositionAndViewStateToItem(HistoryItem*);
         virtual bool canCachePage() const;