Add scroll restoration type to page state

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 175 matching lines @@
 // 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.
 // 18: Add referrer policy.
 // 19: Remove target frame id, which was a bad idea, and original url string,
 //         which is no longer used.
 // 20: Add pinch viewport scroll offset, the offset of the pinched zoomed
 //     viewport within the unzoomed main frame.
-// 21: Add frame sequence number
+// 21: Add frame sequence number.
+// 22: Add scroll restoration type.
 //
 // NOTE: If the version is -1, then the pickle contains only a URL string.
 // See ReadPageState.
 //
 const int kMinVersion = 11;
-const int kCurrentVersion = 21;
+const int kCurrentVersion = 22;
 
 // 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 277 matching lines @@
   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.frame_sequence_number, obj);
   WriteInteger(state.referrer_policy, obj);
   WriteReal(state.pinch_viewport_scroll_offset.x(), obj);
   WriteReal(state.pinch_viewport_scroll_offset.y(), obj);
 
+  WriteInteger(state.scroll_restoration_type, 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
   // is here instead of inside WriteHttpBody.
@@ skipping 51 matching lines @@
   }
 
   if (obj->version >= 20) {
     double x = ReadReal(obj);
     double y = ReadReal(obj);
     state->pinch_viewport_scroll_offset = gfx::PointF(x, y);
   } else {
     state->pinch_viewport_scroll_offset = gfx::PointF(-1, -1);
   }
 
+  if (obj->version >= 22) {
+    state->scroll_restoration_type =
+        static_cast<blink::WebHistoryScrollRestorationType>(ReadInteger(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.
   state->http_body.http_content_type = ReadString(obj);
@@ skipping 86 matching lines @@
 ExplodedHttpBody::ExplodedHttpBody()
     : identifier(0),
       contains_passwords(false),
       is_null(true) {
 }
 
 ExplodedHttpBody::~ExplodedHttpBody() {
 }
 
 ExplodedFrameState::ExplodedFrameState()
-    : item_sequence_number(0),
+    : scroll_restoration_type(blink::WebHistoryScrollRestorationAuto),
+      item_sequence_number(0),
       document_sequence_number(0),
       frame_sequence_number(0),
       page_scale_factor(0.0),
       referrer_policy(blink::WebReferrerPolicyDefault) {
 }
 
 ExplodedFrameState::ExplodedFrameState(const ExplodedFrameState& other) {
   assign(other);
 }
 
 ExplodedFrameState::~ExplodedFrameState() {
 }
 
 void ExplodedFrameState::operator=(const ExplodedFrameState& other) {
   if (&other != this)
     assign(other);
 }
 
 void ExplodedFrameState::assign(const ExplodedFrameState& other) {
   url_string = other.url_string;
   referrer = other.referrer;
   target = other.target;
   state_object = other.state_object;
   document_state = other.document_state;
+  scroll_restoration_type = other.scroll_restoration_type;
   pinch_viewport_scroll_offset = other.pinch_viewport_scroll_offset;
   scroll_offset = other.scroll_offset;
   item_sequence_number = other.item_sequence_number;
   document_sequence_number = other.document_sequence_number;
   frame_sequence_number = other.frame_sequence_number;
   page_scale_factor = other.page_scale_factor;
   referrer_policy = other.referrer_policy;
   http_body = other.http_body;
   children = other.children;
 }
@@ skipping 29 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