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

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

Issue 14495011: Revert "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
« no previous file with comments | « Source/core/loader/ResourceLoader.h ('k') | Source/core/page/ContextMenuController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/ResourceLoader.cpp
diff --git a/Source/core/loader/ResourceLoader.cpp b/Source/core/loader/ResourceLoader.cpp
index 809f7dabdeee7f4b1b3d0492e52cac1ce4735e40..16faac7d0684a9a67787c7388ae4b0228fc83ac5 100644
--- a/Source/core/loader/ResourceLoader.cpp
+++ b/Source/core/loader/ResourceLoader.cpp
@@ -260,7 +260,7 @@ void ResourceLoader::cancel(const ResourceError& error)
if (m_reachedTerminalState)
return;
- ResourceError nonNullError = error.isNull() ? ResourceError::cancelledError(m_request.url()) : error;
+ ResourceError nonNullError = error.isNull() ? cancelledError() : 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,6 +302,16 @@ void ResourceLoader::cancel(const ResourceError& error)
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))
« no previous file with comments | « Source/core/loader/ResourceLoader.h ('k') | Source/core/page/ContextMenuController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698