Update webkit to r53957.

This includes changes to WebKit that make history.{back,forward,go}
behave synchronously when navigating back to a reference fragment.
That is something we still implement asynchronously.  As a result,
we now fail the location-hash.html test.

Includes changes to glue_serialize.cc to support serializing the
WebHistoryItem's documentSequenceNumber.  (+sky for review on this
part.)

TBR=pfeldman,sky

Review URL: http://codereview.chromium.org/556055

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37388 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/webkit/glue/glue_serialize.cc b/webkit/glue/glue_serialize.cc
index 6cbe39b..d16a0bc 100644
--- a/webkit/glue/glue_serialize.cc
+++ b/webkit/glue/glue_serialize.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -49,8 +49,9 @@ struct SerializeObject {
 //    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
@@ -273,6 +274,8 @@ static void WriteHistoryItem(
 
   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);
@@ -315,6 +318,9 @@ static WebHistoryItem ReadHistoryItem(
 
   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);