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

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

Issue 14787005: Simply FrameLoaderStateMachine and FrameLoader::transitionToCommitted(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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/FrameLoader.h » ('j') | Source/core/loader/FrameLoader.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentLoader.cpp
diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
index 0b080c310d4a2260d2b7812869025240bfece397..7b4dc65b2e8a337ba050358080be50ace4acee6c 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -298,6 +298,7 @@ void DocumentLoader::commitIfReady()
if (!m_committed) {
m_committed = true;
frameLoader()->commitProvisionalLoad();
+ m_writer.setMIMEType(m_response.mimeType());
}
}
@@ -681,6 +682,8 @@ void DocumentLoader::commitData(const char* bytes, size_t length)
if (frameLoader()->stateMachine()->creatingInitialEmptyDocument())
return;
+ if (frameLoader()->stateMachine()->isDisplayingInitialEmptyDocument())
+ frameLoader()->stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
// The origin is the MHTML file, we need to set the base URL to the document encoded in the MHTML so
// relative URLs are resolved properly.
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.h » ('j') | Source/core/loader/FrameLoader.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698