Improve handling of CORS redirects for some resource loads.

Source/core/fetch/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 245 matching lines @@
 }
 
 void ResourceLoader::willSendRequest(blink::WebURLLoader*, blink::WebURLRequest& passedRequest, const blink::WebURLResponse& passedRedirectResponse)
 {
     RefPtr<ResourceLoader> protect(this);
 
     ResourceRequest& request(passedRequest.toMutableResourceRequest());
     ASSERT(!request.isNull());
     const ResourceResponse& redirectResponse(passedRedirectResponse.toResourceResponse());
     ASSERT(!redirectResponse.isNull());
-    if (!m_host->shouldRequest(m_resource, request, m_options)) {
+    if (!m_host->canAccessRedirect(m_resource, request, redirectResponse, m_options)) {
         cancel();
         return;
     }
+
     m_host->redirectReceived(m_resource, redirectResponse);
     m_resource->willSendRequest(request, redirectResponse);
     if (request.isNull() || m_state == Terminated)
         return;
 
     m_host->willSendRequest(m_resource->identifier(), request, redirectResponse, m_options.initiatorInfo);
     request.setReportLoadTiming(true);
     ASSERT(!request.isNull());
     m_resource->updateRequest(request);
     m_request = request;
@@ skipping 34 matching lines @@
 
     if (responseNeedsAccessControlCheck()) {
         // If the response successfully validated a cached resource, perform
         // the access control with respect to it. Need to do this right here
         // before the resource switches clients over to that validated resource.
         Resource* resource = m_resource;
         if (resource->isCacheValidator() && resourceResponse.httpStatusCode() == 304)
             resource = m_resource->resourceToRevalidate();
         else
             m_resource->setResponse(resourceResponse);
-        if (!m_host->canAccessResource(resource, response.url())) {
+        if (!m_host->canAccessResource(resource, m_options.securityOrigin.get(), response.url())) {
             cancel();
             return;
         }
     }
 
     // Reference the object in this method since the additional processing can do
     // anything including removing the last reference to this object.
     RefPtr<ResourceLoader> protect(this);
     m_resource->responseReceived(resourceResponse);
     if (m_state == Terminated)
@@ skipping 121 matching lines @@
     didReceiveResponse(0, responseOut);
     if (m_state == Terminated)
         return;
     RefPtr<ResourceLoadInfo> resourceLoadInfo = responseOut.toResourceResponse().resourceLoadInfo();
     m_host->didReceiveData(m_resource, dataOut.data(), dataOut.size(), resourceLoadInfo ? resourceLoadInfo->encodedDataLength : -1);
     m_resource->setResourceBuffer(dataOut);
     didFinishLoading(0, monotonicallyIncreasingTime());
 }
 
 }