Merge 112485 - AssociatedURLLoader does not support Cross Origin Redirects when using

Source/WebKit/chromium/src/AssociatedURLLoader.cpp

 /*
  * Copyright (C) 2010, 2011, 2012 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 122 matching lines @@
 
     virtual void didSendData(unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/);
     virtual void willSendRequest(ResourceRequest& /*newRequest*/, const ResourceResponse& /*redirectResponse*/);
 
     virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
     virtual void didDownloadData(int /*dataLength*/);
     virtual void didReceiveData(const char*, int /*dataLength*/);
     virtual void didReceiveCachedMetadata(const char*, int /*dataLength*/);
     virtual void didFinishLoading(unsigned long /*identifier*/, double /*finishTime*/);
     virtual void didFail(const ResourceError&);
+    virtual void didFailRedirectCheck();
 
     virtual bool isDocumentThreadableLoaderClient() { return true; }
 
     // Sets an error to be reported back to the client, asychronously.
     void setDelayedError(const ResourceError&);
 
     // Enables forwarding of error notifications to the WebURLLoaderClient. These must be
     // deferred until after the call to AssociatedURLLoader::loadAsynchronously() completes.
     void enableErrorNotifications();
 
@@ skipping 103 matching lines @@
 {
     if (!m_client)
         return;
 
     m_didFail = true;
     m_error = WebURLError(error);
     if (m_enableErrorNotifications)
         notifyError(&m_errorTimer);
 }
 
+void AssociatedURLLoader::ClientAdapter::didFailRedirectCheck()
+{
+    m_loader->cancel();
+}
+
 void AssociatedURLLoader::ClientAdapter::setDelayedError(const ResourceError& error)
 {
     didFail(error);
 }
 
 void AssociatedURLLoader::ClientAdapter::enableErrorNotifications()
 {
     m_enableErrorNotifications = true;
     // If an error has already been received, start a timer to report it to the client
     // after AssociatedURLLoader::loadAsynchronously has returned to the caller.
@@ skipping 82 matching lines @@
         m_loader->cancel();
 }
 
 void AssociatedURLLoader::setDefersLoading(bool defersLoading)
 {
     if (m_loader)
         m_loader->setDefersLoading(defersLoading);
 }
 
 } // namespace WebKit