Index: third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
similarity index 98% |
rename from third_party/WebKit/Source/core/fetch/ResourceLoader.cpp |
rename to third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
index 7f11fb7e3efb0206727a53ebf1397a4cc64f2195..510afc9cc5a188453f7b19aeebbbefb60964adc7 100644 |
--- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp |
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
@@ -27,15 +27,15 @@ |
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#include "core/fetch/ResourceLoader.h" |
+#include "platform/loader/fetch/ResourceLoader.h" |
-#include "core/fetch/CrossOriginAccessControl.h" |
-#include "core/fetch/FetchContext.h" |
-#include "core/fetch/Resource.h" |
-#include "core/fetch/ResourceFetcher.h" |
#include "platform/SharedBuffer.h" |
#include "platform/exported/WrappedResourceRequest.h" |
#include "platform/exported/WrappedResourceResponse.h" |
+#include "platform/loader/fetch/CrossOriginAccessControl.h" |
+#include "platform/loader/fetch/FetchContext.h" |
+#include "platform/loader/fetch/Resource.h" |
+#include "platform/loader/fetch/ResourceFetcher.h" |
#include "platform/network/NetworkInstrumentation.h" |
#include "platform/network/ResourceError.h" |
#include "public/platform/Platform.h" |
@@ -135,9 +135,10 @@ void ResourceLoader::cancelForRedirectAccessCheckError( |
ResourceRequestBlockedReason blockedReason) { |
m_resource->willNotFollowRedirect(); |
- if (m_loader) |
+ if (m_loader) { |
handleError( |
ResourceError::cancelledDueToAccessCheckError(newURL, blockedReason)); |
+ } |
} |
static bool isManualRedirectFetchRequest(const ResourceRequest& request) { |