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

public/web/WebHistoryItem.h

Index: public/web/WebHistoryItem.h
diff --git a/public/web/WebHistoryItem.h b/public/web/WebHistoryItem.h
index a706d9a3b6338deebb8d4d325bc225e4dc3a4b8a..58b26b9c21e55198a22b0249909981866d059636 100644
--- a/public/web/WebHistoryItem.h
+++ b/public/web/WebHistoryItem.h
@@ -50,6 +50,11 @@ enum WebHistoryLoadType {
     WebHistoryDifferentDocumentLoad
 };
 
+enum WebHistoryScrollRestorationType {

[Nate Chapin, 2015/05/08 23:19:54]

This and the corresponding type in FrameLoaderTypes.h should be added to
Source/web/AssertMatchingEnums.cpp

+    WebHistoryScrollRestorationAuto,
+    WebHistoryScrollRestorationManual
+};
+
 // Represents a frame-level navigation entry in session history.  A
 // WebHistoryItem is a node in a tree.
 //
@@ -104,6 +109,9 @@ public:
     BLINK_EXPORT long long frameSequenceNumber() const;
     BLINK_EXPORT void setFrameSequenceNumber(long long);
 
+    BLINK_EXPORT WebHistoryScrollRestorationType scrollRestorationType() const;
+    BLINK_EXPORT void setScrollRestorationType(WebHistoryScrollRestorationType);
+
     BLINK_EXPORT WebSerializedScriptValue stateObject() const;
     BLINK_EXPORT void setStateObject(const WebSerializedScriptValue&);