Add DidSaveScrollOrScaleState flag to prevent restoreScrollPositionAndViewState restore from default

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

Index: third_party/WebKit/Source/core/loader/HistoryItem.h
diff --git a/third_party/WebKit/Source/core/loader/HistoryItem.h b/third_party/WebKit/Source/core/loader/HistoryItem.h
index 35ca7fa81c8224130b7fc44ffa908f58e07ed389..a106a4e5e3587f38cfad62b8978bafbc08ba7dfd 100644
--- a/third_party/WebKit/Source/core/loader/HistoryItem.h
+++ b/third_party/WebKit/Source/core/loader/HistoryItem.h
@@ -99,6 +99,12 @@ class CORE_EXPORT HistoryItem final
     return m_scrollRestorationType;
   }
 
+  void setDidSaveScrollState(bool hasSaveScrollState) {
+    m_didSaveScrollState = hasSaveScrollState;
+  }
+
+  bool didSaveScrollState() const { return m_didSaveScrollState; }
+
   void setFormInfoFromRequest(const ResourceRequest&);
   void setFormData(PassRefPtr<EncodedFormData>);
   void setFormContentType(const AtomicString&);
@@ -142,6 +148,8 @@ class CORE_EXPORT HistoryItem final
   RefPtr<EncodedFormData> m_formData;
   AtomicString m_formContentType;
 
+  bool m_didSaveScrollState;

[majidvp, 2017/02/14 20:42:17]

nit: maybe move this next to scroll state related fields.

+
 };  // class HistoryItem
 
 }  // namespace blink