| Index: Source/core/loader/FrameLoader.cpp
|
| ===================================================================
|
| --- Source/core/loader/FrameLoader.cpp (revision 148582)
|
| +++ Source/core/loader/FrameLoader.cpp (working copy)
|
| @@ -2484,7 +2484,9 @@
|
| // FIXME: Don't want to do this if an entirely new load is going, so should check
|
| // that both data sources on the frame are either this or nil.
|
| stop();
|
| - if (m_client->shouldFallBack(error))
|
| +
|
| + ResourceError c(ResourceError::cancelledError(KURL()));
|
| + if (error.errorCode() != c.errorCode() || error.domain() != c.domain())
|
| handleFallbackContent();
|
|
|
| if (m_state == FrameStateProvisional && m_provisionalDocumentLoader) {
|
| @@ -2762,7 +2764,7 @@
|
| notifier()->dispatchWillSendRequest(m_documentLoader.get(), identifier, newRequest, ResourceResponse());
|
|
|
| if (newRequest.isNull())
|
| - error = cancelledError(request);
|
| + error = ResourceError::cancelledError(request.url());
|
| else
|
| error = ResourceError();
|
|
|
| @@ -3038,13 +3040,6 @@
|
| loadDifferentDocumentItem(item, loadType, MayAttemptCacheOnlyLoadForFormSubmissionItem);
|
| }
|
|
|
| -ResourceError FrameLoader::cancelledError(const ResourceRequest& request) const
|
| -{
|
| - ResourceError error = m_client->cancelledError(request);
|
| - error.setIsCancellation(true);
|
| - return error;
|
| -}
|
| -
|
| void FrameLoader::setTitle(const StringWithDirection& title)
|
| {
|
| documentLoader()->setTitle(title);
|
|
|