Add scroll restoration type to page state

content/renderer/history_serialization.cc

 // Copyright 2014 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/renderer/history_serialization.h"
 
 #include "content/common/page_state_serialization.h"
 #include "content/public/common/page_state.h"
 #include "content/renderer/history_entry.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
@@ skipping 71 matching lines @@
 }
 
 void GenerateFrameStateFromItem(const WebHistoryItem& item,
                                 ExplodedFrameState* state) {
   state->url_string = item.urlString();
   state->referrer = item.referrer();
   state->referrer_policy = item.referrerPolicy();
   state->target = item.target();
   if (!item.stateObject().isNull())
     state->state_object = item.stateObject().toString();
+  state->scroll_restoration_type = item.scrollRestorationType();
   state->pinch_viewport_scroll_offset = item.pinchViewportScrollOffset();
   state->scroll_offset = item.scrollOffset();
   state->item_sequence_number = item.itemSequenceNumber();
   state->document_sequence_number =
       item.documentSequenceNumber();
   state->frame_sequence_number =
       item.frameSequenceNumber();
   state->page_scale_factor = item.pageScaleFactor();
   ToNullableString16Vector(item.documentState(), &state->document_state);
 
@@ skipping 33 matching lines @@
   WebHistoryItem item;
   item.initialize();
   item.setURLString(state.url_string);
   item.setReferrer(state.referrer, state.referrer_policy);
   item.setTarget(state.target);
   if (!state.state_object.is_null()) {
     item.setStateObject(
         WebSerializedScriptValue::fromString(state.state_object));
   }
   item.setDocumentState(state.document_state);
+  item.setScrollRestorationType(state.scroll_restoration_type);
   item.setPinchViewportScrollOffset(state.pinch_viewport_scroll_offset);
   item.setScrollOffset(state.scroll_offset);
   item.setPageScaleFactor(state.page_scale_factor);
 
   // These values are generated at WebHistoryItem construction time, and we
   // only want to override those new values with old values if the old values
   // are defined.  A value of 0 means undefined in this context.
   if (state.item_sequence_number)
     item.setItemSequenceNumber(state.item_sequence_number);
   if (state.document_sequence_number)
@@ skipping 48 matching lines @@
   if (!DecodePageState(page_state.ToEncodedData(), &state))
     return scoped_ptr<HistoryEntry>();
 
   scoped_ptr<HistoryEntry> entry(new HistoryEntry());
   RecursivelyGenerateHistoryItem(state.top, entry->root_history_node());
 
   return entry.Pass();
 }
 
 }  // namespace content