Remove our logic to handle stopping a load inside startProvisionaLoad callbacks

Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 947 matching lines @@
     RefPtr<HistoryItem> currentItem = history()->currentItem();
     if (!currentItem) {
         insertDummyHistoryItem();
 
         ASSERT(stateMachine()->isDisplayingInitialEmptyDocument());
         stateMachine()->advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocumentPostCommit);
         stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad);
     }
 }
 
-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)
 {    
     // Protect frame from getting blown away inside dispatchBeforeLoadEvent in loadWithDocumentLoader.
     RefPtr<Frame> protect(m_frame);
 
     KURL url = request.resourceRequest().url();
 
     ASSERT(m_frame->document());
     if (!request.requester()->canDisplay(url)) {
@@ skipping 1114 matching lines @@
 
     setProvisionalDocumentLoader(m_policyDocumentLoader.get());
     m_loadType = type;
     setState(FrameStateProvisional);
 
     setPolicyDocumentLoader(0);
 
     if (formState)
         m_client->dispatchWillSubmitForm(formState);
 
-    prepareForLoadStart();
+    m_progressTracker->progressStarted();
+    m_client->dispatchDidStartProvisionalLoad();
+    ASSERT(m_policyDocumentLoader);
 
-    // 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;
-
-    DocumentLoader* activeDocLoader = activeDocumentLoader();
-    if (activeDocLoader && activeDocLoader->isLoadingMainResource())
-        return;
+    // Notify accessibility.

[abarth-chromium, 2013/06/27 23:21:25]

I would remove this comment :)

+    if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache()) {
+        AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadTypeReload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted;
+        cache->frameLoadingEventNotification(m_frame, loadingEvent);
+    }
 
     m_provisionalDocumentLoader->startLoadingMainResource();
 }
 
 void FrameLoader::checkNewWindowPolicyAndContinue(PassRefPtr<FormState> formState, const String& frameName, const NavigationAction& action)
 {
     if (m_frame->document() && m_frame->document()->isSandboxed(SandboxPopups))
         return;
 
     if (!DOMWindow::allowPopUp(m_frame))
@@ skipping 408 matching lines @@
     FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
 
     page->chrome().setWindowRect(newWindowRect);
     page->chrome().show();
 
     created = true;
     return frame;
 }
 
 } // namespace WebCore