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

third_party/WebKit/Source/core/loader/FrameLoader.h

Index: third_party/WebKit/Source/core/loader/FrameLoader.h
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.h b/third_party/WebKit/Source/core/loader/FrameLoader.h
index 0827dc3d185f638a74bdcb9d99cdd74e7db1339e..ee40c1c0d01b300ef6599a3c65db77b6c1f9fad6 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.h
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.h
@@ -247,7 +247,10 @@ class CORE_EXPORT FrameLoader final {
                           HistoryItem*,
                           ClientRedirectPolicy,
                           Document*);
-  void RestoreScrollPositionAndViewStateForLoadType(FrameLoadType);
+  void RestoreScrollPositionAndViewStateForLoadType(

[majidvp, 2017/06/26 16:19:26]

nit: Given that load type is no longer the sole argument to this function
perhaps we should change its name. 

[Nate Chapin, 2017/07/11 22:17:59]

Dropped "ForLoadType", which leaves multiple functions called
RestoreScrollPositionAndViewState. I don't like that very much, but it's
probably better than leaving the existing name.

+      FrameLoadType,
+      HistoryItem::ScrollAndViewState*,
+      HistoryScrollRestorationType);
 
   void ScheduleCheckCompleted();