Changeset 202336 in webkit

Timestamp:

Jun 22, 2016 11:11:00 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/CrossOriginPreflightChecker.cpp (modified) (3 diffs)
• loader/CrossOriginPreflightChecker.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-22  Youenn Fablet  <youenn@apple.com>
+
+        CrossOriginPreflightChecker should call DocumentThreadableLoader preflightFailure instead of didFailLoading
+        https://bugs.webkit.org/show_bug.cgi?id=158984
+
+        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:
+
 2016-06-22  Youenn Fablet  <youennf@gmail.com>
 

trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp

@@ -57 +57 @@
 }
 
-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)
 {
@@ -100 +91 @@
     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;
     }
@@ -141 +132 @@
 
     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();
 }
 

trunk/Source/WebCore/loader/CrossOriginPreflightChecker.h

@@ -55 +55 @@
 private:
     void notifyFinished(CachedResource*) final;
-    void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) final;
 
     static void handleLoadingFailure(DocumentThreadableLoader&, unsigned long, const ResourceError&);