Add support for serializing WebHistoryItem::itemSequenceNumber....

webkit/glue/glue_serialize.cc

 // Copyright (c) 2010 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 "webkit/glue/glue_serialize.h"
 
 #include <string>
 
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
@@ skipping 37 matching lines @@
 // 1: Initial revision.
 // 2: Added case for NULL string versus "". Version 2 code can read Version 1
 //    data, but not vice versa.
 // 3: Version 2 was broken, it stored number of WebUChars, not number of bytes.
 //    This version checks and reads v1 and v2 correctly.
 // 4: Adds support for storing FormData::identifier().
 // 5: Adds support for empty FormData
 // 6: Adds support for documentSequenceNumbers
 // 7: Adds support for stateObject
 // 8: Adds support for file range and modification time
+// 9: Adds support for itemSequenceNumbers
 // Should be const, but unit tests may modify it.
 //
 // NOTE: If the version is -1, then the pickle contains only a URL string.
 // See CreateHistoryStateForURL.
 //
+#if defined(WEBKIT_BUG_40451_IS_FIXED)
+int kVersion = 9;
+#else
 int kVersion = 8;
+#endif
 
 // A bunch of convenience functions to read/write to SerializeObjects.
 // The serializers assume the input data is in the correct format and so does
 // no error checking.
 inline void WriteData(const void* data, int length, SerializeObject* obj) {
   obj->pickle.WriteData(static_cast<const char*>(data), length);
 }
 
 inline void ReadData(const SerializeObject* obj, const void** data,
                      int* length) {
@@ skipping 114 matching lines @@
   if (length == -1)
     return WebString();
 
   // In version 2, the length field was the length in WebUChars.
   // In version 1 and 3 it is the length in bytes.
   int bytes = ((obj->version == 2) ? length * sizeof(WebUChar) : length);
 
   const void* data;
   if (!ReadBytes(obj, &data, bytes))
     return WebString();
-  return WebString(static_cast<const WebUChar*>(data), bytes / sizeof(WebUChar));
+  return WebString(static_cast<const WebUChar*>(data),
+                   bytes / sizeof(WebUChar));
 }
 
 // Writes a Vector of Strings into a SerializeObject for serialization.
 static void WriteStringVector(
     const WebVector<WebString>& data, SerializeObject* obj) {
   WriteInteger(static_cast<int>(data.size()), obj);
   for (size_t i = 0, c = data.size(); i < c; ++i) {
     unsigned ui = static_cast<unsigned>(i);  // sigh
     WriteString(data[ui], obj);
   }
@@ skipping 89 matching lines @@
   WriteString(item.alternateTitle(), obj);
   WriteReal(item.lastVisitedTime(), obj);
   WriteInteger(item.scrollOffset().x, obj);
   WriteInteger(item.scrollOffset().y, obj);
   WriteBoolean(item.isTargetItem(), obj);
   WriteInteger(item.visitCount(), obj);
   WriteString(item.referrer(), obj);
 
   WriteStringVector(item.documentState(), obj);
 
+#if defined(WEBKIT_BUG_40451_IS_FIXED)
+  if (kVersion >= 9)
+    WriteInteger64(item.itemSequenceNumber(), obj);
+#endif
   if (kVersion >= 6)
     WriteInteger64(item.documentSequenceNumber(), obj);
   if (kVersion >= 7) {
     bool has_state_object = !item.stateObject().isNull();
     WriteBoolean(has_state_object, obj);
     if (has_state_object)
       WriteString(item.stateObject().toString(), obj);
   }
 
   // Yes, the referrer is written twice.  This is for backwards
@@ skipping 39 matching lines @@
   item.setLastVisitedTime(ReadReal(obj));
   int x = ReadInteger(obj);
   int y = ReadInteger(obj);
   item.setScrollOffset(WebPoint(x, y));
   item.setIsTargetItem(ReadBoolean(obj));
   item.setVisitCount(ReadInteger(obj));
   item.setReferrer(ReadString(obj));
 
   item.setDocumentState(ReadStringVector(obj));
 
+#if defined(WEBKIT_BUG_40451_IS_FIXED)
+  if (obj->version >= 9)
+    item.setItemSequenceNumber(ReadInteger64(obj));
+#endif
   if (obj->version >= 6)
     item.setDocumentSequenceNumber(ReadInteger64(obj));
   if (obj->version >= 7) {
     bool has_state_object = ReadBoolean(obj);
     if (has_state_object) {
       item.setStateObject(
           WebSerializedScriptValue::fromString(ReadString(obj)));
     }
   }
 
@@ skipping 81 matching lines @@
   const WebHistoryItem& item = HistoryItemFromString(content_state, false);
   if (item.isNull()) {
     // Couldn't parse the string, return an empty string.
     return std::string();
   }
 
   return HistoryItemToString(item);
 }
 
 }  // namespace webkit_glue