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

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 229 matching lines @@
                  FrameLoadType,
                  NavigationPolicy,
                  HistoryItem*);
 
   void LoadInSameDocument(const KURL&,
                           PassRefPtr<SerializedScriptValue> state_object,
                           FrameLoadType,
                           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();
 
   void DetachDocumentLoader(Member<DocumentLoader>&);
 
   void UpgradeInsecureRequest(ResourceRequest&, Document*) const;
 
   std::unique_ptr<TracedValue> ToTracedValue() const;
   void TakeObjectSnapshot() const;
 
@@ skipping 25 matching lines @@
   SandboxFlags forced_sandbox_flags_;
 
   bool dispatching_did_clear_window_object_in_main_world_;
   bool protect_provisional_loader_;
   bool detached_;
 };
 
 }  // namespace blink
 
 #endif  // FrameLoader_h