Revert 115549 - Ensure that there's always a provisional document loader if the frame loader is in …

Source/WebCore/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 198 matching lines @@
     if (m_networkingContext)
         m_networkingContext->invalidate();
 }
 
 void FrameLoader::init()
 {
     // This somewhat odd set of steps gives the frame an initial empty document.
     // It would be better if this could be done with even fewer steps.
     m_stateMachine.advanceTo(FrameLoaderStateMachine::CreatingInitialEmptyDocument);
     setPolicyDocumentLoader(m_client->createDocumentLoader(ResourceRequest(KURL(ParsedURLString, emptyString())), SubstituteData()).get());
-    // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
-    if (!m_policyDocumentLoader.get())
-        CRASH();
     setProvisionalDocumentLoader(m_policyDocumentLoader.get());
     setState(FrameStateProvisional);
     m_provisionalDocumentLoader->setResponse(ResourceResponse(KURL(), "text/html", 0, String(), String()));
     m_provisionalDocumentLoader->finishedLoading();
     ASSERT(!m_frame->document());
     m_documentLoader->writer()->begin(KURL(), false);
     m_documentLoader->writer()->end();
     m_frame->document()->cancelParsing();
     m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
     m_didCallImplicitClose = true;
@@ skipping 856 matching lines @@
 
     // Notify accessibility.
     if (AXObjectCache::accessibilityEnabled()) {
         AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadTypeReload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted;
         m_frame->document()->axObjectCache()->frameLoadingEventNotification(m_frame, loadingEvent);
     }
 }
 
 void FrameLoader::setupForReplace()
 {
-    // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
-    if (!m_documentLoader.get())
-        CRASH();
     setState(FrameStateProvisional);
     m_provisionalDocumentLoader = m_documentLoader;
     m_documentLoader = 0;
     detachChildren();
 }
 
 void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockHistory, bool lockBackForwardList,
     PassRefPtr<Event> event, PassRefPtr<FormState> formState, ShouldSendReferrer shouldSendReferrer)
 {    
     // Protect frame from getting blown away inside dispatchBeforeLoadEvent in loadWithDocumentLoader.
@@ skipping 388 matching lines @@
         history()->setProvisionalItem(0);
 
     for (RefPtr<Frame> child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
         child->loader()->stopAllLoaders(clearProvisionalItemPolicy);
     if (m_provisionalDocumentLoader)
         m_provisionalDocumentLoader->stopLoading();
     if (m_documentLoader)
         m_documentLoader->stopLoading();
 
     setProvisionalDocumentLoader(0);
-    if (m_state == FrameStateProvisional)
-        setState(FrameStateComplete);
 
     m_checkTimer.stop();
 
     m_inStopAllLoaders = false;    
 }
 
 void FrameLoader::stopForUserCancel(bool deferCheckLoadComplete)
 {
     stopAllLoaders();
     
@@ skipping 94 matching lines @@
     else if (newState == FrameStateComplete) {
         frameLoadCompleted();
         storedTimeOfLastCompletedLoad = currentTime();
         if (m_documentLoader)
             m_documentLoader->stopRecordingResponses();
     }
 }
 
 void FrameLoader::clearProvisionalLoad()
 {
+    setProvisionalDocumentLoader(0);
     if (Page* page = m_frame->page())
         page->progress()->progressCompleted(m_frame);
-    setProvisionalDocumentLoader(0);
     setState(FrameStateComplete);
 }
 
 void FrameLoader::commitProvisionalLoad()
 {
     RefPtr<CachedPage> cachedPage = m_loadingFromCachedPage ? pageCache()->get(history()->provisionalItem()) : 0;
     RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
 
     LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame->tree()->uniqueName().string().utf8().data(),
         m_frame->document() ? m_frame->document()->url().string().utf8().data() : "", 
@@ skipping 933 matching lines @@
 {
     m_quickRedirectComing = false;
 
     if (!shouldContinue)
         return;
 
     // If we have a provisional request for a different document, a fragment scroll should cancel it.
     if (m_provisionalDocumentLoader && !equalIgnoringFragmentIdentifier(m_provisionalDocumentLoader->request().url(), request.url())) {
         m_provisionalDocumentLoader->stopLoading();
         setProvisionalDocumentLoader(0);
-        // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
-        if (m_state == FrameStateProvisional)
-            CRASH();
     }
 
     bool isRedirect = m_quickRedirectComing || policyChecker()->loadType() == FrameLoadTypeRedirectWithLockedBackForwardList;    
     loadInSameDocument(request.url(), 0, !isRedirect);
 }
 
 bool FrameLoader::shouldPerformFragmentNavigation(bool isFormSubmission, const String& httpMethod, FrameLoadType loadType, const KURL& url)
 {
     // We don't do this if we are submitting a form with method other than "GET", explicitly reloading,
     // currently displaying a frameset, or if the URL does not have a fragment.
@@ skipping 142 matching lines @@
     if (!m_frame->page())
         return;
 
 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     if (Page* page = m_frame->page()) {
         if (page->mainFrame() == m_frame)
             m_frame->page()->inspectorController()->resume();
     }
 #endif
 
-    // FIXME: Make this an ASSERT() instead once we figured out what's going wrong.
-    if (!m_policyDocumentLoader.get())
-        CRASH();
     setProvisionalDocumentLoader(m_policyDocumentLoader.get());
     m_loadType = type;
     setState(FrameStateProvisional);
 
     setPolicyDocumentLoader(0);
 
     if (isBackForwardLoadType(type) && history()->provisionalItem()->isInPageCache()) {
         loadProvisionalItemFromCachedPage();
         return;
     }
@@ skipping 485 matching lines @@
         windowRect.setHeight(features.height + (windowRect.height() - pageSize.height()));
     page->chrome()->setWindowRect(windowRect);
 
     page->chrome()->show();
 
     created = true;
     return frame;
 }
 
 } // namespace WebCore