| 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 b165a2e788363496aed321df4557f0904602bf14..ccbee6fabbbe59bbb494caf7ef1bd0d28bb09e47 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -435,18 +435,28 @@ void FrameLoader::receivedFirstData()
|
| dispatchDidClearDocumentOfWindowObject();
|
| }
|
|
|
| -void FrameLoader::didBeginDocument(bool dispatch)
|
| +void FrameLoader::didInstallNewDocument(bool dispatchWindowObjectAvailable)
|
| {
|
| ASSERT(m_frame);
|
| ASSERT(m_frame->document());
|
| - ASSERT(m_frame->document()->fetcher());
|
| +
|
| m_frame->document()->setReadyState(Document::Loading);
|
|
|
| - if (dispatch)
|
| + 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()
|
| +{
|
| + ASSERT(m_frame);
|
| + ASSERT(m_frame->document());
|
| + ASSERT(m_frame->document()->fetcher());
|
| +
|
| if (m_documentLoader) {
|
| String suboriginHeader = m_documentLoader->response().httpHeaderField(HTTPNames::Suborigin);
|
| if (!suboriginHeader.isNull()) {
|
| @@ -482,9 +492,6 @@ void FrameLoader::didBeginDocument(bool dispatch)
|
| }
|
| }
|
|
|
| - if (m_provisionalItem && isBackForwardLoadType(m_loadType))
|
| - m_frame->document()->setStateForNewFormElements(m_provisionalItem->documentState());
|
| -
|
| client()->didCreateNewDocument();
|
| }
|
|
|
|
|