summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframe_impl.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:08:56 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:08:56 +0000
commit606843faf131685e7802df12f2ee97efc7cf2f3b (patch)
treef4d494147c9190ba22c370148ab5aab2020f6d1a /webkit/glue/webframe_impl.cc
parent63e78057b6ae2685ed3525d832fed48b7c85ee1e (diff)
downloadchromium_src-606843faf131685e7802df12f2ee97efc7cf2f3b.zip
chromium_src-606843faf131685e7802df12f2ee97efc7cf2f3b.tar.gz
chromium_src-606843faf131685e7802df12f2ee97efc7cf2f3b.tar.bz2
Remove the URL and title from the state getting functions and IPC messages.
If the title or URL changes, we'll be updated in other ways, so this extra processing is wasted. Review URL: http://codereview.chromium.org/12859 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.cc')
-rw-r--r--webkit/glue/webframe_impl.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 78ac3d4..d639558 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -477,8 +477,7 @@ GURL WebFrameImpl::GetOSDDURL() const {
return GURL();
}
-bool WebFrameImpl::GetPreviousState(GURL* url, std::wstring* title,
- std::string* history_state) const {
+bool WebFrameImpl::GetPreviousHistoryState(std::string* history_state) const {
// We use the previous item here because documentState (filled-out forms)
// only get saved to history when it becomes the previous item. The caller
// is expected to query the history state after a navigation occurs, after
@@ -494,14 +493,10 @@ bool WebFrameImpl::GetPreviousState(GURL* url, std::wstring* title,
StatsScope<StatsCounterTimer> history_scope(history_timer);
webkit_glue::HistoryItemToString(item, history_state);
- *url = webkit_glue::KURLToGURL(item->url());
- *title = webkit_glue::StringToStdWString(item->title());
-
return true;
}
-bool WebFrameImpl::GetCurrentState(GURL* url, std::wstring* title,
- std::string* state) const {
+bool WebFrameImpl::GetCurrentHistoryState(std::string* state) const {
if (frame_->loader())
frame_->loader()->saveDocumentAndScrollState();
RefPtr<HistoryItem> item = frame_->page()->backForwardList()->currentItem();
@@ -509,13 +504,10 @@ bool WebFrameImpl::GetCurrentState(GURL* url, std::wstring* title,
return false;
webkit_glue::HistoryItemToString(item, state);
- *url = webkit_glue::KURLToGURL(item->url());
- *title = webkit_glue::StringToStdWString(item->title());
-
return true;
}
-bool WebFrameImpl::HasCurrentState() const {
+bool WebFrameImpl::HasCurrentHistoryState() const {
return frame_->page()->backForwardList()->currentItem() != NULL;
}