Accept options in history APIs to allow scroll restoration to be disabled

Source/core/loader/HistoryItem.h

 /*
  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef HistoryItem_h
 #define HistoryItem_h
 
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "core/CoreExport.h"
+#include "core/loader/FrameLoaderTypes.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/Referrer.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Document;
@@ skipping 49 matching lines @@
 
     void setItemSequenceNumber(long long number) { m_itemSequenceNumber = number; }
     long long itemSequenceNumber() const { return m_itemSequenceNumber; }
 
     void setDocumentSequenceNumber(long long number) { m_documentSequenceNumber = number; }
     long long documentSequenceNumber() const { return m_documentSequenceNumber; }
 
     void setFrameSequenceNumber(long long number) { m_frameSequenceNumber = number; }
     long long frameSequenceNumber() const { return m_frameSequenceNumber; }
 
+    void setScrollRestorationType(HistoryScrollRestorationType  type) { m_scrollRestorationType = type; }
+    HistoryScrollRestorationType scrollRestorationType() { return m_scrollRestorationType; }
+
     void setFormInfoFromRequest(const ResourceRequest&);
     void setFormData(PassRefPtr<FormData>);
     void setFormContentType(const AtomicString&);
 
     bool isCurrentDocument(Document*) const;
 
     DECLARE_TRACE();
 
 private:
     HistoryItem();
@@ skipping 18 matching lines @@
     // refer to the same instance of a document. Traversing history from one
     // such HistoryItem to another preserves the document.
     int64_t m_documentSequenceNumber;
 
     // If two HistoryItems have the same frame sequence number, then they
     // refer to the same instance of a Frame. This is used to determine whether
     // whether a HistoryItem should navigate an existing frame or create a new
     // one during a history navigation.
     int64_t m_frameSequenceNumber;
 
+    // Type of the scroll restoration for the history item determines if scroll
+    // position should be restored when it is loaded during history traversal.
+    HistoryScrollRestorationType m_scrollRestorationType;
+
     // Support for HTML5 History
     RefPtr<SerializedScriptValue> m_stateObject;
 
     // info used to repost form data
     RefPtr<FormData> m_formData;
     AtomicString m_formContentType;
 
 }; // class HistoryItem
 
 } // namespace blink
 
 #endif // HISTORYITEM_H