Chrome side of webkit merge to r40164....

webkit/glue/glue_serialize.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include <string>
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ skipping 226 matching lines @@
   WriteString(item->originalURLString(), obj);
   WriteString(item->target(), obj);
   WriteString(item->parent(), obj);
   WriteString(item->title(), obj);
   WriteString(item->alternateTitle(), obj);
   WriteReal(item->lastVisitedTime(), obj);
   WriteInteger(item->scrollPoint().x(), 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);
   for (size_t i = 0, c = item->children().size(); i < c; ++i)
     WriteHistoryItem(item->children().at(i).get(), obj);
 }
 
 // Creates a new HistoryItem tree based on the serialized string.
 // Assumes the data is in the format returned by WriteHistoryItem.
 static PassRefPtr<HistoryItem> ReadHistoryItem(const SerializeObject* obj) {
@@ skipping 10 matching lines @@
   item->setTarget(ReadString(obj));
   item->setParent(ReadString(obj));
   item->setTitle(ReadString(obj));
   item->setAlternateTitle(ReadString(obj));
   item->setLastVisitedTime(ReadReal(obj));
   int x = ReadInteger(obj);
   int y = ReadInteger(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);
   item->setDocumentState(document_state);
 
   // Form data.  If there is any form data, we assume POST, otherwise GET.
   // ResourceRequest takes ownership of the new FormData, then gives it to
   // HistoryItem.
   ResourceRequest dummy_request;  // only way to initialize HistoryItem
   dummy_request.setHTTPBody(ReadFormData(obj));
@@ skipping 59 matching lines @@
 std::string CreateHistoryStateForURL(const GURL& url) {
   // TODO(eseide): We probably should be passing a list visit time other than 0
   RefPtr<HistoryItem> item(HistoryItem::create(GURLToKURL(url), String(), 0));
   std::string data;
   HistoryItemToString(item, &data);
   return data;
 }
 
 }  // namespace webkit_glue