Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp |
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
index ccbee6fabbbe59bbb494caf7ef1bd0d28bb09e47..b165a2e788363496aed321df4557f0904602bf14 100644 |
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp |
@@ -435,27 +435,17 @@ |
dispatchDidClearDocumentOfWindowObject(); |
} |
-void FrameLoader::didInstallNewDocument(bool dispatchWindowObjectAvailable) |
-{ |
- ASSERT(m_frame); |
- ASSERT(m_frame->document()); |
- |
- m_frame->document()->setReadyState(Document::Loading); |
- |
- if (dispatchWindowObjectAvailable) |
- dispatchDidClearDocumentOfWindowObject(); |
- |
- m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_documentLoader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create()); |
- |
- if (m_provisionalItem && isBackForwardLoadType(m_loadType)) |
- m_frame->document()->setStateForNewFormElements(m_provisionalItem->documentState()); |
-} |
- |
-void FrameLoader::didBeginDocument() |
+void FrameLoader::didBeginDocument(bool dispatch) |
{ |
ASSERT(m_frame); |
ASSERT(m_frame->document()); |
ASSERT(m_frame->document()->fetcher()); |
+ m_frame->document()->setReadyState(Document::Loading); |
+ |
+ if (dispatch) |
+ dispatchDidClearDocumentOfWindowObject(); |
+ |
+ m_frame->document()->initContentSecurityPolicy(m_documentLoader ? m_documentLoader->releaseContentSecurityPolicy() : ContentSecurityPolicy::create()); |
if (m_documentLoader) { |
String suboriginHeader = m_documentLoader->response().httpHeaderField(HTTPNames::Suborigin); |
@@ -491,6 +481,9 @@ |
m_frame->document()->setContentLanguage(AtomicString(headerContentLanguage)); |
} |
} |
+ |
+ if (m_provisionalItem && isBackForwardLoadType(m_loadType)) |
+ m_frame->document()->setStateForNewFormElements(m_provisionalItem->documentState()); |
client()->didCreateNewDocument(); |
} |