Index: Source/core/loader/ResourceLoader.cpp |
=================================================================== |
--- Source/core/loader/ResourceLoader.cpp (revision 148844) |
+++ Source/core/loader/ResourceLoader.cpp (working copy) |
@@ -260,7 +260,7 @@ |
if (m_reachedTerminalState) |
return; |
- ResourceError nonNullError = error.isNull() ? cancelledError() : error; |
+ ResourceError nonNullError = error.isNull() ? ResourceError::cancelledError(m_request.url()) : error; |
// This function calls out to clients at several points that might do |
// something that causes the last reference to this object to go away. |
@@ -302,16 +302,6 @@ |
releaseResources(); |
} |
-ResourceError ResourceLoader::cancelledError() |
-{ |
- return frameLoader()->cancelledError(m_request); |
-} |
- |
-ResourceError ResourceLoader::cannotShowURLError() |
-{ |
- return frameLoader()->client()->cannotShowURLError(m_request); |
-} |
- |
void ResourceLoader::willSendRequest(ResourceHandle*, ResourceRequest& request, const ResourceResponse& redirectResponse) |
{ |
if (documentLoader()->applicationCacheHost()->maybeLoadFallbackForRedirect(this, request, redirectResponse)) |