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

Unified Diff: Source/core/loader/FrameLoader.cpp

Issue 18110006: Remove our logic to handle stopping a load inside startProvisionaLoad callbacks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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 | « Source/core/loader/FrameLoader.h ('k') | Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698