| Index: Source/WebCore/loader/ResourceLoader.cpp
|
| ===================================================================
|
| --- Source/WebCore/loader/ResourceLoader.cpp (revision 148290)
|
| +++ Source/WebCore/loader/ResourceLoader.cpp (working copy)
|
| @@ -352,7 +352,7 @@
|
| if (m_reachedTerminalState)
|
| return;
|
|
|
| - ResourceError nonNullError = error.isNull() ? cancelledError() : error;
|
| + ResourceError nonNullError = error.isNull() ? ResourceError::createCancelledError(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.
|
| @@ -394,16 +394,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))
|
|
|