Modified: trunk/Source/WebCore/ChangeLog (202335 => 202336)
--- trunk/Source/WebCore/ChangeLog 2016-06-22 18:10:45 UTC (rev 202335)
+++ trunk/Source/WebCore/ChangeLog 2016-06-22 18:11:00 UTC (rev 202336)
@@ -1,3 +1,22 @@
+2016-06-22 Youenn Fablet <[email protected]>
+
+ 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 <[email protected]>
JSDOMIterator forEach should support second optional parameter
Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp (202335 => 202336)
--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-06-22 18:10:45 UTC (rev 202335)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-06-22 18:11:00 UTC (rev 202336)
@@ -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)
Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.h (202335 => 202336)
--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.h 2016-06-22 18:10:45 UTC (rev 202335)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.h 2016-06-22 18:11:00 UTC (rev 202336)
@@ -54,7 +54,6 @@
private:
void notifyFinished(CachedResource*) final;
- void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) final;
static void handleLoadingFailure(DocumentThreadableLoader&, unsigned long, const ResourceError&);
static void validatePreflightResponse(DocumentThreadableLoader&, ResourceRequest&&, unsigned long, const ResourceResponse&);
