summaryrefslogtreecommitdiffstats
path: root/webkit/glue/glue_serialize.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-24 00:27:23 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-24 00:27:23 +0000
commitf460ef7d1e7e9421be4e7f868b2629fc64060ade (patch)
treefb86d8ea685f04a2bd84307a17bba172a2e07f1f /webkit/glue/glue_serialize.cc
parent0a93350fc146cd0ecf360b704f4934817e9c6be0 (diff)
downloadchromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.zip
chromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.tar.gz
chromium_src-f460ef7d1e7e9421be4e7f868b2629fc64060ade.tar.bz2
Chrome side of webkit merge to r40164.
One file added between r40124 and r40164, however, all the worker files didn't seem to be in the xcode project so I added all of them. Review URL: http://codereview.chromium.org/18733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/glue_serialize.cc')
-rw-r--r--webkit/glue/glue_serialize.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index dc44c20..ba2d9a9 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -244,14 +244,14 @@ static void WriteHistoryItem(const HistoryItem* item, SerializeObject* obj) {
WriteInteger(item->scrollPoint().y(), obj);
WriteBoolean(item->isTargetItem(), obj);
WriteInteger(item->visitCount(), obj);
- WriteString(item->rssFeedReferrer(), obj);
+ WriteString(item->referrer(), obj);
WriteStringVector(item->documentState(), obj);
// No access to formData through a const HistoryItem = lame.
WriteFormData(const_cast<HistoryItem*>(item)->formData(), obj);
WriteString(item->formContentType(), obj);
- WriteString(item->formReferrer(), obj);
+ WriteString(item->referrer(), obj);
// Subitems
WriteInteger(static_cast<int>(item->children().size()), obj);
@@ -282,7 +282,7 @@ static PassRefPtr<HistoryItem> ReadHistoryItem(const SerializeObject* obj) {
item->setScrollPoint(IntPoint(x, y));
item->setIsTargetItem(ReadBoolean(obj));
item->setVisitCount(ReadInteger(obj));
- item->setRSSFeedReferrer(ReadString(obj));
+ item->setReferrer(ReadString(obj));
Vector<String> document_state;
ReadStringVector(obj, &document_state);