commit f88d4faf459369c3cdad139f7c10db58d3a300ff
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Jun 22 18:11:00 2016 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Jun 22 18:11:00 2016 +0000
tree 548bf0d91e0be2e3a330f8ee1ab1a8d270597bec
parent 31d216e37326820e14f839aa8fab5651d0b45e83

CrossOriginPreflightChecker should call DocumentThreadableLoader preflightFailure instead of didFailLoading
https://bugs.webkit.org/show_bug.cgi?id=158984

Patch by Youenn Fablet <youenn@apple.com> on 2016-06-22
Reviewed by Darin Adler.

No change of behavior.

Calling DocumentThreadableLoader preflightFailure instead of didFailLoading for any preflight error case.

* loader/CrossOriginPreflightChecker.cpp:
(WebCore::CrossOriginPreflightChecker::notifyFinished): Directly calling preflightFailure callback.
(WebCore::CrossOriginPreflightChecker::doPreflight): Ditto.
(WebCore::CrossOriginPreflightChecker::handleLoadingFailure): Deleted.
(WebCore::CrossOriginPreflightChecker::redirectReceived): Deleted (should have been removed as part of
https://bugs.webkit.org/show_bug.cgi?id=111008).
* loader/CrossOriginPreflightChecker.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@202336 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/loader/CrossOriginPreflightChecker.cpp

diff --git a/Source/WebCore/loader/CrossOriginPreflightChecker.cpp b/Source/WebCore/loader/CrossOriginPreflightChecker.cpp
index 1ddcade..ddc0c70 100644
--- a/Source/WebCore/loader/CrossOriginPreflightChecker.cpp
+++ b/Source/WebCore/loader/CrossOriginPreflightChecker.cpp
@@ -56,15 +56,6 @@
         m_resource->removeClient(this);
 }
 
-void CrossOriginPreflightChecker::handleLoadingFailure(DocumentThreadableLoader& loader, unsigned long identifier, const ResourceError& error)
-{
-    // FIXME: We might want to call preflightFailure instead.
-    Frame* frame = loader.document().frame();
-    ASSERT(frame);
-    InspectorInstrumentation::didFailLoading(frame, frame->loader().documentLoader(), identifier, error);
-    loader.didFail(identifier, error);
-}
-
 void CrossOriginPreflightChecker::validatePreflightResponse(DocumentThreadableLoader& loader, ResourceRequest&& request, unsigned long identifier, const ResourceResponse& response)
 {
     Frame* frame = loader.document().frame();
@@ -99,7 +90,7 @@
 {
     ASSERT_UNUSED(resource, resource == m_resource);
     if (m_resource->loadFailedOrCanceled()) {
-        handleLoadingFailure(m_loader, m_resource->identifier(), m_resource->resourceError());
+        m_loader.preflightFailure(m_resource->identifier(), m_resource->resourceError());
         return;
     }
     validatePreflightResponse(m_loader, WTFMove(m_request), m_resource->identifier(), m_resource->response());
@@ -140,19 +131,12 @@
     unsigned identifier = loader.document().frame()->loader().loadResourceSynchronously(preflightRequest, loader.options().allowCredentials(), loader.options().clientCredentialPolicy(), error, response, data);
 
     if (!error.isNull() && response.httpStatusCode() <= 0) {
-        handleLoadingFailure(loader, identifier, error);
+        loader.preflightFailure(identifier, error);
         return;
     }
     validatePreflightResponse(loader, WTFMove(request), identifier, response);
 }
 
-void CrossOriginPreflightChecker::redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&)
-{
-    // FIXME: We should call preflightFailure or set redirect mode to error.
-    ASSERT(m_loader.m_client);
-    m_loader.m_client->didFailRedirectCheck();
-}
-
 void CrossOriginPreflightChecker::setDefersLoading(bool value)
 {
     if (m_resource)