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; |
} |