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

Source/core/frame/History.h

 /*
  * Copyright (C) 2007 Apple Inc.  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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 21 matching lines @@
 #include "core/frame/DOMWindowProperty.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
 class LocalFrame;
 class KURL;
 class ExecutionContext;
 class ExceptionState;
+class StateOptions;
 
 class History final : public GarbageCollectedFinalized<History>, public ScriptWrappable, public DOMWindowProperty {
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(History);
 public:
     static History* create(LocalFrame* frame)
     {
         return new History(frame);
     }
 
     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();
 
 private:
     explicit History(LocalFrame*);
 
     KURL urlForState(const String& url);
 
     SerializedScriptValue* stateInternal() const;
 
     RefPtr<SerializedScriptValue> m_lastStateObjectRequested;
 };
 
 } // namespace blink
 
 #endif // History_h