Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(778)

Unified Diff: content/renderer/history_serialization.cc

Issue 959783003: Add scroll restoration type to page state (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use enum for scroll restoration type Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/history_serialization.cc
diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc
index 04460aa7c5e5f45fcec378dd0ff8b9c398027c7e..1d14357f5a612e16fc410f0a08fa0d5d3ec5c65d 100644
--- a/content/renderer/history_serialization.cc
+++ b/content/renderer/history_serialization.cc
@@ -89,6 +89,7 @@ void GenerateFrameStateFromItem(const WebHistoryItem& item,
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();
@@ -142,6 +143,7 @@ void RecursivelyGenerateHistoryItem(const ExplodedFrameState& state,
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);
« no previous file with comments | « content/common/page_state_serialization_unittest.cc ('k') | content/test/data/page_state/serialized_v21.dat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698