Index: Source/core/loader/FrameLoader.cpp |
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp |
index 4f35b4d226af3baf851dd081c0f658b7063aac66..0ebac0ff8f807d7042dd9b2a84d8178d1584191d 100644 |
--- a/Source/core/loader/FrameLoader.cpp |
+++ b/Source/core/loader/FrameLoader.cpp |
@@ -315,7 +315,7 @@ void FrameLoader::didExplicitOpen() |
// Calling document.open counts as committing the first real document load. |
if (!m_stateMachine.committedFirstRealDocumentLoad()) |
- m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocumentPostCommit); |
+ m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad); |
// Prevent window.open(url) -- eg window.open("about:blank") -- from blowing away results |
// from a subsequent window.document.open / window.document.write call. |
@@ -367,7 +367,7 @@ void FrameLoader::clear(bool clearWindowProperties, bool clearScriptObjects, boo |
m_checkTimer.stop(); |
m_shouldCallCheckCompleted = false; |
- if (m_stateMachine.isDisplayingInitialEmptyDocument() && m_stateMachine.committedFirstRealDocumentLoad()) |
+ if (m_stateMachine.isDisplayingInitialEmptyDocument()) |
m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad); |
} |
@@ -990,9 +990,6 @@ void FrameLoader::commitProvisionalLoad() |
history()->updateForCommit(); |
m_client->transitionToCommittedForNewPage(); |
- if (!m_stateMachine.creatingInitialEmptyDocument() && !m_stateMachine.committedFirstRealDocumentLoad()) |
- m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocumentPostCommit); |
- |
m_frame->navigationScheduler()->cancel(); |
m_frame->editor()->clearLastEditCommand(); |