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

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

Issue 22891017: Remove FrameLoaderStateMachine::DisplayingInitialEmptyDocumentPostCommit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | « no previous file | Source/core/loader/FrameLoaderStateMachine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « no previous file | Source/core/loader/FrameLoaderStateMachine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698