Changing scroll and view state in onpopstate shouldn't overwrite back/forward state restore

content/renderer/history_serialization.cc

Index: content/renderer/history_serialization.cc
diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc
index c24d9d74c4e0573a643a269cdd04a83cf800b14f..9d3a59cd9f1c1e74b5e19dccb959de2ea20b5e6f 100644
--- a/content/renderer/history_serialization.cc
+++ b/content/renderer/history_serialization.cc
@@ -99,10 +99,12 @@ void RecursivelyGenerateHistoryItem(const ExplodedFrameState& state,
                  });
   item.SetDocumentState(document_state);
   item.SetScrollRestorationType(state.scroll_restoration_type);
-  item.SetVisualViewportScrollOffset(state.visual_viewport_scroll_offset);
-  item.SetScrollOffset(state.scroll_offset);
-  item.SetPageScaleFactor(state.page_scale_factor);
-  item.SetDidSaveScrollOrScaleState(state.did_save_scroll_or_scale_state);
+
+  if (state.did_save_scroll_or_scale_state) {
+    item.SetVisualViewportScrollOffset(state.visual_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