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

Source/WebCore/loader/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 14 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "ResourceLoader.h"
 
 #include "ApplicationCacheHost.h"
 #include "CachedResourceLoader.h"
+#include "CancelledResourceError.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
 #include "MemoryCache.h"
 #include "Page.h"
 #include "ProgressTracker.h"
 #include "ResourceBuffer.h"
@@ skipping 243 matching lines @@
 {
     cancel(ResourceError());
 }
 
 void ResourceLoader::cancel(const ResourceError& error)
 {
     // If the load has already completed - succeeded, failed, or previously cancelled - do nothing.
     if (m_reachedTerminalState)
         return;
        
-    ResourceError nonNullError = error.isNull() ? cancelledError() : error;
+    ResourceError nonNullError = error.isNull() ? CancelledResourceError(m_request.url()) : error;

[darin (slow to review), 2013/04/17 18:58:11]

I think some compilers will actually complain here since the type of
CancelledResourceError and |error| are different.  Probably another reason why
it would be good to change to a function that returns ResourceError.

Since we have excluded policy change error, I'm now wondering if it should be:

  cancelledResourceError(failingURL)

or:

  ResourceError::cancelledError(failingURL);

Maybe the latter is better since cancellation is a concept known to
ResourceError, and this would provide a canonical way to construct a
ResourceError representing cancellation.  We might even want to make the
setIsCancellation() private.

 
     // This function calls out to clients at several points that might do
     // something that causes the last reference to this object to go away.
     RefPtr<ResourceLoader> protector(this);
     
     // If we re-enter cancel() from inside this if() block, we want to pick up from where we left
     // off without re-running it
     if (m_state == Initialized) {
         LOG(ResourceLoading, "Cancelled load of '%s'.\n", m_resource->url().string().latin1().data());
         m_state = Finishing;
@@ skipping 21 matching lines @@
             frameLoader()->notifier()->didFailToLoad(this, nonNullError);
     }
 
     // If cancel() completed from within the call to willCancel() or didFailToLoad(),
     // we don't want to redo didCancel() or releasesResources().
     if (m_reachedTerminalState)
         return;
     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))
         return;
 
     // Store the previous URL because we may modify it.
     KURL previousURL = m_request.url();
     RefPtr<ResourceLoader> protect(this);
 
     ASSERT(!request.isNull());
@@ skipping 240 matching lines @@
     info.addMember(m_originalRequest, "originalRequest");
     info.addMember(m_resourceData, "resourceData");
     info.addMember(m_deferredRequest, "deferredRequest");
     info.addMember(m_options, "options");
     info.addMember(m_resource, "resource");
     info.addMember(m_documentLoader, "documentLoader");
     info.addMember(m_requestCountTracker, "requestCountTracker");
 }
 
 }