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

Source/core/frame/History.h

Index: Source/core/frame/History.h
diff --git a/Source/core/frame/History.h b/Source/core/frame/History.h
index 80a0de1aa92b62a5c97436674bbb5569ae25e544..da9169dbc78b3331d34bb858d4820ac795ec2325 100644
--- a/Source/core/frame/History.h
+++ b/Source/core/frame/History.h
@@ -1,4 +1,4 @@
-/*
+  /*

[Nate Chapin, 2015/05/07 20:26:59]

This seems accidental

[majidvp, 2015/05/08 21:00:47]

Done.

  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ class LocalFrame;
 class KURL;
 class ExecutionContext;
 class ExceptionState;
+class StateOptions;
 
 class History final : public GarbageCollectedFinalized<History>, public ScriptWrappable, public DOMWindowProperty {
     DEFINE_WRAPPERTYPEINFO();
@@ -51,25 +52,26 @@ public:
 
     unsigned length() const;
     SerializedScriptValue* state();
+    void options(StateOptions&);
 
     void back(ExecutionContext*);
     void forward(ExecutionContext*);
     void go(ExecutionContext*, int distance);
 
-    void pushState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, ExceptionState& exceptionState)
+    void pushState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, const StateOptions& options, ExceptionState& exceptionState)
     {
-        stateObjectAdded(data, title, url, FrameLoadTypeStandard, exceptionState);
+        stateObjectAdded(data, title, url, options, FrameLoadTypeStandard, exceptionState);
     }
 
-    void replaceState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, ExceptionState& exceptionState)
+    void replaceState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, const StateOptions& options, ExceptionState& exceptionState)
     {
-        stateObjectAdded(data, title, url, FrameLoadTypeRedirectWithLockedBackForwardList, exceptionState);
+        stateObjectAdded(data, title, url, options, FrameLoadTypeRedirectWithLockedBackForwardList, exceptionState);
     }
 
     bool stateChanged() const;
     bool isSameAsCurrentState(SerializedScriptValue*) const;
 
-    void stateObjectAdded(PassRefPtr<SerializedScriptValue>, const String& title, const String& url, FrameLoadType, ExceptionState&);
+    void stateObjectAdded(PassRefPtr<SerializedScriptValue>, const String& title, const String& url, const StateOptions&, FrameLoadType, ExceptionState&);
 
     DECLARE_VIRTUAL_TRACE();