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

Unified Diff: Source/core/loader/FrameLoader.h

Issue 1159723003: Don't reuse HistoryItems for multiple navigations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 5 years, 6 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
Index: Source/core/loader/FrameLoader.h
diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
index 9f575075104c3be4628e253ee493d08b2328ef5f..3bf958ac3c9b9432fec255e12a160d7b292a6734 100644
--- a/Source/core/loader/FrameLoader.h
+++ b/Source/core/loader/FrameLoader.h
@@ -171,7 +171,6 @@ public:
HistoryItem* currentItem() const { return m_currentItem.get(); }
void saveScrollState();
- void clearScrollPositionAndViewState();
void restoreScrollPositionAndViewState();
@@ -192,8 +191,12 @@ private:
void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
-
- void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceState = false, HistoryScrollRestorationType = ScrollRestorationAuto, PassRefPtr<SerializedScriptValue> = nullptr);
+ enum class HistoryNavigationType {
+ DifferentDocument,
+ Fragment,
+ HistoryApi
+ };
+ void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType);
void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> stateObject, FrameLoadType, ClientRedirectPolicy);
« no previous file with comments | « LayoutTests/fast/history/resources/replaceState-during-beforeunload.html ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698