| 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 05fe06764a622b43a0f3a1bb6f29cff79696e1db..e42f972d2e0abec7cd7436b59f14b218f5e9c438 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -1214,7 +1214,7 @@ void FrameLoader::receivedMainResourceError(DocumentLoader* loader, const Resour
|
|
|
| HistoryCommitType historyCommitType = loadTypeToCommitType(m_loadType);
|
| if (loader == m_provisionalDocumentLoader) {
|
| - client()->dispatchDidFailProvisionalLoad(error, historyCommitType);
|
| + client()->dispatchDidFailProvisionalLoad(loader, error, historyCommitType);
|
| if (loader != m_provisionalDocumentLoader)
|
| return;
|
| detachDocumentLoader(m_provisionalDocumentLoader);
|
| @@ -1224,7 +1224,7 @@ void FrameLoader::receivedMainResourceError(DocumentLoader* loader, const Resour
|
| if (m_frame->document()->parser())
|
| m_frame->document()->parser()->stopParsing();
|
| if (!m_provisionalDocumentLoader && m_frame->isLoading()) {
|
| - client()->dispatchDidFailLoad(error, historyCommitType);
|
| + client()->dispatchDidFailLoad(loader, error, historyCommitType);
|
| m_progressTracker->progressCompleted();
|
| }
|
| }
|
| @@ -1357,14 +1357,14 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
|
| m_loadType = type;
|
|
|
| if (frameLoadRequest.form())
|
| - client()->dispatchWillSubmitForm(frameLoadRequest.form());
|
| + client()->dispatchWillSubmitForm(m_provisionalDocumentLoader.get(), frameLoadRequest.form());
|
|
|
| m_progressTracker->progressStarted();
|
| if (m_provisionalDocumentLoader->isClientRedirect())
|
| m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url());
|
| m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->request().url());
|
| double triggeringEventTime = frameLoadRequest.triggeringEvent() ? frameLoadRequest.triggeringEvent()->platformTimeStamp() : 0;
|
| - client()->dispatchDidStartProvisionalLoad(triggeringEventTime);
|
| + client()->dispatchDidStartProvisionalLoad(m_provisionalDocumentLoader.get(), triggeringEventTime);
|
| ASSERT(m_provisionalDocumentLoader);
|
| m_provisionalDocumentLoader->startLoadingMainResource();
|
| }
|
|
|