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

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: 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 | « no previous file | Source/core/loader/FrameLoader.h » ('j') | no next file with comments »
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 c5dbd81bee9313d410e27146666535a8dd3e82f3..7dd228d5128c286fd97025dac17c788807b6b515 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -292,6 +292,7 @@ void DocumentLoader::commitIfReady()
if (!m_committed) {
m_committed = true;
frameLoader()->commitProvisionalLoad();
+ m_writer.setMIMEType(m_response.mimeType());
}
}
@@ -646,6 +647,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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698