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..3a5192e3c69802374a3f0422f9bbd41e160b5939 100644
--- a/third_party/WebKit/Source/core/loader/HistoryItem.h
+++ b/third_party/WebKit/Source/core/loader/HistoryItem.h
@@ -60,6 +60,12 @@ class CORE_EXPORT HistoryItem final
   EncodedFormData* formData();
   const AtomicString& formContentType() const;
 
+  void setDidSaveScrollOrScaleState(bool hasSaveScrollOrScaleState) {

[majidvp, 2017/02/15 17:37:32]

nit: I think the bool name should match the setter/memeber name i.e.,
|didSaveScrollOrScaleState|

+    m_didSaveScrollOrScaleState = hasSaveScrollOrScaleState;
+  }
+
+  bool didSaveScrollOrScaleState() const { return m_didSaveScrollOrScaleState; }
+
   const ScrollOffset& visualViewportScrollOffset() const;
   void setVisualViewportScrollOffset(const ScrollOffset&);
   const ScrollOffset& getScrollOffset() const;
@@ -114,6 +120,7 @@ class CORE_EXPORT HistoryItem final
   Referrer m_referrer;
   String m_target;
 
+  bool m_didSaveScrollOrScaleState;
   ScrollOffset m_visualViewportScrollOffset;
   ScrollOffset m_scrollOffset;
   float m_pageScaleFactor;
@@ -141,7 +148,6 @@ class CORE_EXPORT HistoryItem final
   // info used to repost form data
   RefPtr<EncodedFormData> m_formData;
   AtomicString m_formContentType;
-
 };  // class HistoryItem
 
 }  // namespace blink