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

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

Issue 76653002: Simplify setting lockBackForwardList() in NavigationScheduler. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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.cpp
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
index ffb0b020aa0a80bec72ddbb3e845367de87ca2eb..131dfc2f3998206815c019e2db50dcab9f89602d 100644
--- a/Source/core/loader/FrameLoader.cpp
+++ b/Source/core/loader/FrameLoader.cpp
@@ -292,6 +292,8 @@ void FrameLoader::clear(ClearOptions options)
if (m_stateMachine.isDisplayingInitialEmptyDocument())
m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
+ else if (!m_stateMachine.committedMultipleRealLoads())
+ m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedMultipleRealLoads);
}
void FrameLoader::receivedFirstData()
@@ -1298,8 +1300,7 @@ void FrameLoader::loadWithNavigationAction(const NavigationAction& action, Frame
m_stateMachine.advanceTo(FrameLoaderStateMachine::StartedFirstRealLoad);
// The current load should replace the history item if it is the first real
- // load of the frame. FrameLoadTypeRedirectWithLockedBackForwardList is a
- // proxy for history()->currentItemShouldBeReplaced().
Nate Chapin 2013/11/19 20:05:25 This sentence wasn't accurate, and now it's obsole
+ // load of the frame.
bool replacesCurrentHistoryItem = false;
if (type == FrameLoadTypeRedirectWithLockedBackForwardList
|| !m_stateMachine.committedFirstRealDocumentLoad()) {
« no previous file with comments | « no previous file | Source/core/loader/FrameLoaderStateMachine.h » ('j') | Source/core/loader/NavigationScheduler.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698