Replace history.options with history.scrollRestoration attribute

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 96cb261520985637c8b45128105cac81efd1aca7..dfa2d022ae20a31841c2b90cb64d9ad8e2a0954f 100644
--- a/Source/core/frame/History.h
+++ b/Source/core/frame/History.h
@@ -39,7 +39,6 @@ class LocalFrame;
 class KURL;
 class ExecutionContext;
 class ExceptionState;
-class StateOptions;
 
 class History final : public GarbageCollectedFinalized<History>, public ScriptWrappable, public DOMWindowProperty {
     DEFINE_WRAPPERTYPEINFO();
@@ -52,26 +51,28 @@ public:
 
     unsigned length() const;
     SerializedScriptValue* state();
-    void options(StateOptions&);
 
     void back(ExecutionContext*);
     void forward(ExecutionContext*);
     void go(ExecutionContext*, int delta);
 
-    void pushState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, const StateOptions& options, ExceptionState& exceptionState)
+    void pushState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, ExceptionState& exceptionState)
     {
-        stateObjectAdded(data, title, url, options, FrameLoadTypeStandard, exceptionState);
+        stateObjectAdded(data, title, url, scrollRestorationInternal(), FrameLoadTypeStandard, exceptionState);
     }
 
-    void replaceState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, const StateOptions& options, ExceptionState& exceptionState)
+    void replaceState(PassRefPtr<SerializedScriptValue> data, const String& title, const String& url, ExceptionState& exceptionState)
     {
-        stateObjectAdded(data, title, url, options, FrameLoadTypeReplaceCurrentItem, exceptionState);
+        stateObjectAdded(data, title, url, scrollRestorationInternal(), FrameLoadTypeReplaceCurrentItem, exceptionState);
     }
 
+    void setScrollRestoration(const String& value);
+    String scrollRestoration();
+    HistoryScrollRestorationType scrollRestorationInternal() const;

[Nate Chapin, 2015/07/16 21:34:01]

Should this be private?

[majidvp, 2015/07/16 22:11:49]

It should.

+
     bool stateChanged() const;
     bool isSameAsCurrentState(SerializedScriptValue*) const;
 
-    void stateObjectAdded(PassRefPtr<SerializedScriptValue>, const String& title, const String& url, const StateOptions&, FrameLoadType, ExceptionState&);
 
     DECLARE_VIRTUAL_TRACE();
 
@@ -80,6 +81,7 @@ private:
 
     KURL urlForState(const String& url);
 
+    void stateObjectAdded(PassRefPtr<SerializedScriptValue>, const String& title, const String& url, HistoryScrollRestorationType, FrameLoadType, ExceptionState&);
     SerializedScriptValue* stateInternal() const;
 
     RefPtr<SerializedScriptValue> m_lastStateObjectRequested;