Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: Source/core/frame/History.h

Issue 927213004: Accept options in history APIs to allow scroll restoration to be disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/History.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/History.h
diff --git a/Source/core/frame/History.h b/Source/core/frame/History.h
index 80a0de1aa92b62a5c97436674bbb5569ae25e544..78993c2bedb5c78f2d87d351a3052efaa1c4797d 100644
--- a/Source/core/frame/History.h
+++ b/Source/core/frame/History.h
@@ -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();
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/History.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698