Remove a bunch of provisionalDataSource() usage.

third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 338 matching lines @@
     client->frameDetached(m_webFrame, static_cast<WebFrameClient::DetachType>(type));
     // Clear our reference to LocalFrame at the very end, in case the client
     // refers to it.
     m_webFrame->setCoreFrame(nullptr);
 }
 
 void FrameLoaderClientImpl::dispatchWillSendRequest(
     DocumentLoader* loader, unsigned long identifier, ResourceRequest& request,
     const ResourceResponse& redirectResponse)
 {
+    if (!loader)
+        loader = m_webFrame->frame()->loader().documentLoader();
     // Give the WebFrameClient a crack at the request.
     if (m_webFrame->client()) {
         WrappedResourceRequest webreq(request);
         WrappedResourceResponse webresp(redirectResponse);
         m_webFrame->client()->willSendRequest(
-            m_webFrame, identifier, webreq, webresp);
+            WebDataSourceImpl::fromDocumentLoader(loader), identifier, webreq, webresp);
     }
 }
 
 void FrameLoaderClientImpl::dispatchDidReceiveResponse(DocumentLoader* loader,
                                                        unsigned long identifier,
                                                        const ResourceResponse& response)
 {
     if (m_webFrame->client()) {
         WrappedResourceResponse webresp(response);
         m_webFrame->client()->didReceiveResponse(m_webFrame, identifier, webresp);
@@ skipping 52 matching lines @@
     if (m_webFrame->client())
         m_webFrame->client()->didNavigateWithinPage(m_webFrame, WebHistoryItem(item), static_cast<WebHistoryCommitType>(commitType));
 }
 
 void FrameLoaderClientImpl::dispatchWillClose()
 {
     if (m_webFrame->client())
         m_webFrame->client()->willClose(m_webFrame);
 }
 
-void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(double triggeringEventTime)
+void FrameLoaderClientImpl::dispatchDidStartProvisionalLoad(DocumentLoader* loader, double triggeringEventTime)
 {
     if (m_webFrame->client())
-        m_webFrame->client()->didStartProvisionalLoad(m_webFrame, triggeringEventTime);
+        m_webFrame->client()->didStartProvisionalLoad(WebDataSourceImpl::fromDocumentLoader(loader), triggeringEventTime);
 }
 
 void FrameLoaderClientImpl::dispatchDidReceiveTitle(const String& title)
 {
     if (m_webFrame->client())
         m_webFrame->client()->didReceiveTitle(m_webFrame, title, WebTextDirectionLeftToRight);
 }
 
 void FrameLoaderClientImpl::dispatchDidChangeIcons(IconType type)
 {
     if (m_webFrame->client())
         m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL::Type>(type));
 }
 
 void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryCommitType commitType)
 {
     m_webFrame->viewImpl()->didCommitLoad(commitType == StandardCommit, false);
     if (m_webFrame->client())
         m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, WebHistoryItem(item), static_cast<WebHistoryCommitType>(commitType));
     WebDevToolsAgentImpl* devToolsAgent = WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->devToolsAgentImpl();
     if (devToolsAgent)
         devToolsAgent->didCommitLoadForLocalFrame(m_webFrame->frame());
 }
 
-void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(
+void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(DocumentLoader* loader,
     const ResourceError& error, HistoryCommitType commitType)
 {
-    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().provisionalDocumentLoader());
-    m_webFrame->didFail(error, true, commitType);
+    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(loader);
+    if (m_webFrame->client())
+        m_webFrame->client()->didFailProvisionalLoad(WebDataSourceImpl::fromDocumentLoader(loader), error, static_cast<WebHistoryCommitType>(commitType));
     if (observer)
         observer->didFailLoading(error);
 }
 
-void FrameLoaderClientImpl::dispatchDidFailLoad(const ResourceError& error, HistoryCommitType commitType)
+void FrameLoaderClientImpl::dispatchDidFailLoad(DocumentLoader* loader, const ResourceError& error, HistoryCommitType commitType)
 {
-    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(m_webFrame->frame()->loader().documentLoader());
-    m_webFrame->didFail(error, false, commitType);
+    OwnPtr<WebPluginLoadObserver> observer = pluginLoadObserver(loader);
+    if (m_webFrame->client())
+        m_webFrame->client()->didFailLoad(WebDataSourceImpl::fromDocumentLoader(loader), error, static_cast<WebHistoryCommitType>(commitType));
     if (observer)
         observer->didFailLoading(error);
 
     // Don't clear the redirect chain, this will happen in the middle of client
     // redirects, and we need the context. The chain will be cleared when the
     // provisional load succeeds or fails, not the "real" one.
 }
 
 void FrameLoaderClientImpl::dispatchDidFinishLoad()
 {
@@ skipping 85 matching lines @@
 
     return m_webFrame->client()->hasPendingNavigation(m_webFrame);
 }
 
 void FrameLoaderClientImpl::dispatchWillSendSubmitEvent(HTMLFormElement* form)
 {
     if (m_webFrame->client())
         m_webFrame->client()->willSendSubmitEvent(m_webFrame, WebFormElement(form));
 }
 
-void FrameLoaderClientImpl::dispatchWillSubmitForm(HTMLFormElement* form)
+void FrameLoaderClientImpl::dispatchWillSubmitForm(DocumentLoader* loader, HTMLFormElement* form)
 {
     if (m_webFrame->client())
-        m_webFrame->client()->willSubmitForm(m_webFrame, WebFormElement(form));
+        m_webFrame->client()->willSubmitForm(WebDataSourceImpl::fromDocumentLoader(loader), WebFormElement(form));
 }
 
 void FrameLoaderClientImpl::didStartLoading(LoadStartType loadStartType)
 {
     if (m_webFrame->client())
         m_webFrame->client()->didStartLoading(loadStartType == NavigationToDifferentDocument);
 }
 
 void FrameLoaderClientImpl::progressEstimateChanged(double progressEstimate)
 {
@@ skipping 359 matching lines @@
 
 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, SuddenTerminationDisablerType type)
 {
     if (m_webFrame->client()) {
         m_webFrame->client()->suddenTerminationDisablerChanged(
             present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(type));
     }
 }
 
 } // namespace blink