Update webkit to r53957....

webkit/glue/glue_serialize.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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"
 #include "googleurl/src/gurl.h"
@@ skipping 30 matching lines @@
 
 // TODO(mpcomplete): obsolete versions 1 and 2 after 1/1/2008.
 // Version ID used in reading/writing history items.
 // 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
 // Should be const, but unit tests may modify it.
-int kVersion = 5;
+int kVersion = 6;
 
 // 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 202 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);
 
+  WriteInteger64(item.documentSequenceNumber(), obj);
+
   // Yes, the referrer is written twice.  This is for backwards
   // compatibility with the format.
   WriteFormData(item.httpBody(), obj);
   WriteString(item.httpContentType(), obj);
   WriteString(item.referrer(), obj);
 
   // Subitems
   const WebVector<WebHistoryItem>& children = item.children();
   WriteInteger(static_cast<int>(children.size()), obj);
   for (size_t i = 0, c = children.size(); i < c; ++i)
@@ skipping 22 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 (obj->version >= 6)
+    item.setDocumentSequenceNumber(ReadInteger64(obj));
+
   // The extra referrer string is read for backwards compat.
   const WebHTTPBody& http_body = ReadFormData(obj);
   const WebString& http_content_type = ReadString(obj);
   ALLOW_UNUSED const WebString& unused_referrer = ReadString(obj);
   if (include_form_data) {
     item.setHTTPBody(http_body);
     item.setHTTPContentType(http_content_type);
   }
 
   // Subitems
@@ skipping 65 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