Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: Source/core/loader/ResourceLoader.cpp

Issue 14264012: Create errors (especially cancellation errors) internally to WebCore, rather (Closed) Base URL: svn://svn.chromium.org/blink/trunk/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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))

Powered by Google App Engine
This is Rietveld 408576698