Add a target_frame_id to the history serialization format.

content/common/page_state_serialization.cc

 // Copyright 2013 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 "content/common/page_state_serialization.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/pickle.h"
@@ skipping 169 matching lines @@
   bool parse_error;
 };
 
 // Version ID of serialized format.
 // 11: Min version
 // 12: Adds support for contains_passwords in HTTP body
 // 13: Adds support for URL (FileSystem URL)
 // 14: Adds list of referenced files, version written only for first item.
 // 15: Removes a bunch of values we defined but never used.
 // 16: Switched from blob urls to blob uuids.
+// 17: Add a target frame id number.
 //
 // NOTE: If the version is -1, then the pickle contains only a URL string.
 // See ReadPageState.
 //
 const int kMinVersion = 11;
-const int kCurrentVersion = 16;
+const int kCurrentVersion = 17;
 
 // A bunch of convenience functions to read/write to SerializeObjects.  The
 // de-serializers assume the input data will be in the correct format and fall
 // back to returning safe defaults when not.
 
 void WriteData(const void* data, int length, SerializeObject* obj) {
   obj->pickle.WriteData(static_cast<const char*>(data), length);
 }
 
 void ReadData(SerializeObject* obj, const void** data, int* length) {
@@ skipping 289 matching lines @@
   WriteString(state.target, obj);
   WriteInteger(state.scroll_offset.x(), obj);
   WriteInteger(state.scroll_offset.y(), obj);
   WriteString(state.referrer, obj);
 
   WriteStringVector(state.document_state, obj);
 
   WriteReal(state.page_scale_factor, obj);
   WriteInteger64(state.item_sequence_number, obj);
   WriteInteger64(state.document_sequence_number, obj);
+  WriteInteger64(state.target_frame_id, obj);
 
   bool has_state_object = !state.state_object.is_null();
   WriteBoolean(has_state_object, obj);
   if (has_state_object)
     WriteString(state.state_object, obj);
 
   WriteHttpBody(state.http_body, obj);
 
   // NOTE: It is a quirk of the format that we still have to write the
   // http_content_type field when the HTTP body is null.  That's why this code
@@ skipping 30 matching lines @@
     ConsumeBoolean(obj);  // Skip obsolete target item flag.
     ConsumeInteger(obj);  // Skip obsolete visit count field.
   }
   state->referrer = ReadString(obj);
 
   ReadStringVector(obj, &state->document_state);
 
   state->page_scale_factor = ReadReal(obj);
   state->item_sequence_number = ReadInteger64(obj);
   state->document_sequence_number = ReadInteger64(obj);
+  if (obj->version >= 17)
+    state->target_frame_id = ReadInteger64(obj);
 
   bool has_state_object = ReadBoolean(obj);
   if (has_state_object)
     state->state_object = ReadString(obj);
 
   ReadHttpBody(obj, &state->http_body);
 
   // NOTE: It is a quirk of the format that we still have to read the
   // http_content_type field when the HTTP body is null.  That's why this code
   // is here instead of inside ReadHttpBody.
@@ skipping 88 matching lines @@
       contains_passwords(false),
       is_null(true) {
 }
 
 ExplodedHttpBody::~ExplodedHttpBody() {
 }
 
 ExplodedFrameState::ExplodedFrameState()
     : item_sequence_number(0),
       document_sequence_number(0),
+      target_frame_id(0),
       page_scale_factor(0.0) {
 }
 
 ExplodedFrameState::~ExplodedFrameState() {
 }
 
 ExplodedPageState::ExplodedPageState() {
 }
 
 ExplodedPageState::~ExplodedPageState() {
@@ skipping 24 matching lines @@
     float device_scale_factor,
     ExplodedPageState* exploded) {
   g_device_scale_factor_for_testing = device_scale_factor;
   bool rv = DecodePageState(encoded, exploded);
   g_device_scale_factor_for_testing = 0.0;
   return rv;
 }
 #endif
 
 }  // namespace content