Index: Source/core/fetch/ResourceFetcher.cpp |
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp |
index af4d726b500337d7789b38d13b016ba462ba6dc7..3f9c09c7af509b837f459dbea36ee5b44cc73b81 100644 |
--- a/Source/core/fetch/ResourceFetcher.cpp |
+++ b/Source/core/fetch/ResourceFetcher.cpp |
@@ -201,7 +201,7 @@ bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sour |
resource->setCORSFailed(); |
if (!forPreload && (logErrorsDecision == ShouldLogAccessControlErrors)) { |
String resourceType = Resource::resourceTypeToString(resource->type(), resource->options().initiatorInfo); |
- context().addConsoleMessage(resourceType + " from origin '" + SecurityOrigin::create(url)->toString() + "' has been blocked from loading by Cross-Origin Resource Sharing policy: " + errorDescription); |
+ context().addConsoleMessage("Access to " + resourceType + " from origin '" + SecurityOrigin::create(url)->toString() + "' has been blocked by Cross-Origin Resource Sharing policy: " + errorDescription); |
} |
return false; |
} |
@@ -939,9 +939,9 @@ bool ResourceFetcher::isLoadedBy(ResourceFetcher* possibleOwner) const |
return this == possibleOwner; |
} |
-bool ResourceFetcher::canAccessRedirect(Resource* resource, ResourceRequest& request, const ResourceResponse& redirectResponse, ResourceLoaderOptions& options) |
+bool ResourceFetcher::canAccessRedirect(Resource* resource, ResourceRequest& newRequest, const ResourceResponse& redirectResponse, ResourceLoaderOptions& options) |
{ |
- if (!context().canRequest(resource->type(), request, request.url(), options, resource->isUnusedPreload(), FetchRequest::UseDefaultOriginRestrictionForType)) |
+ if (!context().canRequest(resource->type(), newRequest, newRequest.url(), options, resource->isUnusedPreload(), FetchRequest::UseDefaultOriginRestrictionForType)) |
return false; |
if (options.corsEnabled == IsCORSEnabled) { |
SecurityOrigin* sourceOrigin = options.securityOrigin.get(); |
@@ -950,13 +950,13 @@ bool ResourceFetcher::canAccessRedirect(Resource* resource, ResourceRequest& req |
String errorMessage; |
StoredCredentials withCredentials = resource->lastResourceRequest().allowStoredCredentials() ? AllowStoredCredentials : DoNotAllowStoredCredentials; |
- if (!CrossOriginAccessControl::handleRedirect(sourceOrigin, request, redirectResponse, withCredentials, options, errorMessage)) { |
+ if (!CrossOriginAccessControl::handleRedirect(sourceOrigin, newRequest, redirectResponse, withCredentials, options, errorMessage)) { |
resource->setCORSFailed(); |
context().addConsoleMessage(errorMessage); |
return false; |
} |
} |
- if (resource->type() == Resource::Image && shouldDeferImageLoad(request.url())) |
+ if (resource->type() == Resource::Image && shouldDeferImageLoad(newRequest.url())) |
return false; |
return true; |
} |