WebKit side of merge from r41149 to r41181.

WebCore/loader/DocumentThreadableLoader.cpp

 /*
  * Copyright (C) 2009 Google 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 64 matching lines @@
     m_client = 0;
 }
 
 void DocumentThreadableLoader::willSendRequest(SubresourceLoader*, ResourceRequest& request, const ResourceResponse&)
 {
     ASSERT(m_client);
 
     // FIXME: This needs to be fixed to follow the redirect correctly even for cross-domain requests.
     if (!m_document->securityOrigin()->canRequest(request.url())) {
         RefPtr<DocumentThreadableLoader> protect(this);
-        m_client->didFailWillSendRequestCheck();
+        m_client->didFailRedirectCheck();
         cancel();
     }
 }
 
 void DocumentThreadableLoader::didSendData(SubresourceLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
 {
     ASSERT(m_client);
     m_client->didSendData(bytesSent, totalBytesToBeSent);
 }
 
@@ skipping 22 matching lines @@
     m_client->didFail(error);
 }
 
 void DocumentThreadableLoader::receivedCancellation(SubresourceLoader*, const AuthenticationChallenge& challenge)
 {
     ASSERT(m_client);
     m_client->didReceiveAuthenticationCancellation(challenge.failureResponse());
 }
 
 } // namespace WebCore