Fixes bug where first login attempt to hotmail after session restore...

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 253 matching lines @@
   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) {
+static PassRefPtr<HistoryItem> ReadHistoryItem(const SerializeObject* obj,
+                                               bool include_form_data) {
   // See note in WriteHistoryItem. on this.
   obj->version = ReadInteger(obj);
 
   if (obj->version > kVersion || obj->version < 1)
     return NULL;
 
   RefPtr<HistoryItem> item = HistoryItem::create();
 
   item->setURLString(ReadString(obj));
   item->setOriginalURLString(ReadString(obj));
   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->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.
+  // FormData is ref counted.
   ResourceRequest dummy_request;  // only way to initialize HistoryItem
   dummy_request.setHTTPBody(ReadFormData(obj));
   dummy_request.setHTTPContentType(ReadString(obj));
   dummy_request.setHTTPReferrer(ReadString(obj));
   if (dummy_request.httpBody())
     dummy_request.setHTTPMethod("POST");
-  item->setFormInfoFromRequest(dummy_request);
+  if (include_form_data)
+    item->setFormInfoFromRequest(dummy_request);
 
   // Subitems
   int num_children = ReadInteger(obj);
   for (int i = 0; i < num_children; ++i)
-    item->addChildItem(ReadHistoryItem(obj));
+    item->addChildItem(ReadHistoryItem(obj, include_form_data));
 
   return item.release();
 }
 
 // Serialize a HistoryItem to a string, using our JSON Value serializer.
 void HistoryItemToString(PassRefPtr<HistoryItem> item,
                          std::string* serialized_item) {
   if (!item) {
     serialized_item->clear();
     return;
   }
 
   SerializeObject obj;
   WriteHistoryItem(item.get(), &obj);
   *serialized_item = obj.GetAsString();
 }
 
 // Reconstruct a HistoryItem from a string, using our JSON Value deserializer.
 // This assumes that the given serialized string has all the required key,value
-// pairs, and does minimal error checking.
+// pairs, and does minimal error checking. If |include_form_data| is true,
+// the form data from a post is restored, otherwise the form data is empty.
 PassRefPtr<HistoryItem> HistoryItemFromString(

[darin (slow to review), 2009/03/26 17:03:48]

nit: since this function is only used in this file, please mark it 'static'

-    const std::string& serialized_item) {
+    const std::string& serialized_item,
+    bool include_form_data) {
   if (serialized_item.empty())
     return NULL;
 
   SerializeObject obj(serialized_item.data(),
                       static_cast<int>(serialized_item.length()));
-  return ReadHistoryItem(&obj);
+  return ReadHistoryItem(&obj, include_form_data);
+}
+
+PassRefPtr<HistoryItem> HistoryItemFromString(
+    const std::string& serialized_item) {
+  return HistoryItemFromString(serialized_item, true);
 }
 
 // For testing purposes only.
 void HistoryItemToVersionedString(PassRefPtr<HistoryItem> item, int version,
                                   std::string* serialized_item) {
   if (!item) {
     serialized_item->clear();
     return;
   }
 
   // Temporarily change the version.
   int real_version = kVersion;
   kVersion = version;
 
   SerializeObject obj;
   WriteHistoryItem(item.get(), &obj);
   *serialized_item = obj.GetAsString();
 
   kVersion = real_version;
 }
 
 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;
 }
 
+std::string RemoveFormDataFromHistoryState(const std::string& content_state) {
+  RefPtr<HistoryItem> history_item(HistoryItemFromString(content_state, false));
+  if (!history_item.get()) {
+    // Couldn't parse the string, return an empty string.
+    return std::string();
+  }
+  std::string new_state;
+  HistoryItemToString(history_item, &new_state);
+  return new_state;
+}
+
 }  // namespace webkit_glue