Create errors (especially cancellation errors) internally to WebCore, rather

Source/core/loader/FrameLoader.cpp

Index: Source/core/loader/FrameLoader.cpp
===================================================================
--- Source/core/loader/FrameLoader.cpp	(revision 148844)
+++ Source/core/loader/FrameLoader.cpp	(working copy)
@@ -2443,7 +2443,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())

[darin (slow to review), 2013/04/25 18:15:54]

nit: might be good to leave a FIXME comment in here about using isCancellation
once we can make that work.

         handleFallbackContent();
 
     if (m_state == FrameStateProvisional && m_provisionalDocumentLoader) {
@@ -2723,7 +2725,7 @@
     notifier()->dispatchWillSendRequest(m_documentLoader.get(), identifier, newRequest, ResourceResponse());
 
     if (newRequest.isNull())
-        error = cancelledError(request);
+        error = ResourceError::cancelledError(request.url());
     else
         error = ResourceError();
 
@@ -2999,13 +3001,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);