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

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

Issue 14787005: Simply FrameLoaderStateMachine and FrameLoader::transitionToCommitted(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merge to trunk for landing Created 7 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/loader/FrameLoaderStateMachine.h ('k') | Source/core/loader/HistoryController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoaderStateMachine.cpp
diff --git a/Source/core/loader/FrameLoaderStateMachine.cpp b/Source/core/loader/FrameLoaderStateMachine.cpp
index 6b6835f8cfea10afee971604993f1ad463c2236f..ec335fd761e82285b24f6571c959fa84ea4f6db9 100644
--- a/Source/core/loader/FrameLoaderStateMachine.cpp
+++ b/Source/core/loader/FrameLoaderStateMachine.cpp
@@ -46,7 +46,7 @@ bool FrameLoaderStateMachine::committingFirstRealLoad() const
bool FrameLoaderStateMachine::committedFirstRealDocumentLoad() const
{
- return m_state >= DisplayingInitialEmptyDocumentPostCommit;
+ return m_state >= CommittedFirstRealLoad;
}
bool FrameLoaderStateMachine::creatingInitialEmptyDocument() const
@@ -56,17 +56,12 @@ bool FrameLoaderStateMachine::creatingInitialEmptyDocument() const
bool FrameLoaderStateMachine::isDisplayingInitialEmptyDocument() const
{
- return m_state == DisplayingInitialEmptyDocument || m_state == DisplayingInitialEmptyDocumentPostCommit;
-}
-
-bool FrameLoaderStateMachine::firstLayoutDone() const
-{
- return m_state == FirstLayoutDone;
+ return m_state == DisplayingInitialEmptyDocument;
}
void FrameLoaderStateMachine::advanceTo(State state)
{
- ASSERT(State(m_state + 1) == state || (firstLayoutDone() && state == CommittedFirstRealLoad));
+ ASSERT(State(m_state + 1) == state);
m_state = state;
}
« no previous file with comments | « Source/core/loader/FrameLoaderStateMachine.h ('k') | Source/core/loader/HistoryController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698