| Index: Source/core/loader/FrameLoader.cpp
|
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
|
| index f510cf298ed9fcbc39681f7921b3f888bbf2fabb..77781957ba8c6d53bb90511d3148db502338d57b 100644
|
| --- a/Source/core/loader/FrameLoader.cpp
|
| +++ b/Source/core/loader/FrameLoader.cpp
|
| @@ -965,18 +965,6 @@ void FrameLoader::prepareForHistoryNavigation()
|
| }
|
| }
|
|
|
| -void FrameLoader::prepareForLoadStart()
|
| -{
|
| - m_progressTracker->progressStarted();
|
| - m_client->dispatchDidStartProvisionalLoad();
|
| -
|
| - // Notify accessibility.
|
| - if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache()) {
|
| - AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadTypeReload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted;
|
| - cache->frameLoadingEventNotification(m_frame, loadingEvent);
|
| - }
|
| -}
|
| -
|
| void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockBackForwardList,
|
| PassRefPtr<Event> event, PassRefPtr<FormState> formState, ShouldSendReferrer shouldSendReferrer)
|
| {
|
| @@ -2111,16 +2099,14 @@ void FrameLoader::checkNavigationPolicyAndContinueLoad(PassRefPtr<FormState> for
|
| if (formState)
|
| m_client->dispatchWillSubmitForm(formState);
|
|
|
| - prepareForLoadStart();
|
| -
|
| - // The load might be cancelled inside of prepareForLoadStart(), nulling out the m_provisionalDocumentLoader,
|
| - // so we need to null check it again.
|
| - if (!m_provisionalDocumentLoader)
|
| - return;
|
| + m_progressTracker->progressStarted();
|
| + m_client->dispatchDidStartProvisionalLoad();
|
| + ASSERT(m_policyDocumentLoader);
|
|
|
| - DocumentLoader* activeDocLoader = activeDocumentLoader();
|
| - if (activeDocLoader && activeDocLoader->isLoadingMainResource())
|
| - return;
|
| + if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache()) {
|
| + AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadTypeReload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted;
|
| + cache->frameLoadingEventNotification(m_frame, loadingEvent);
|
| + }
|
|
|
| m_provisionalDocumentLoader->startLoadingMainResource();
|
| }
|
|
|