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

Unified Diff: Source/core/xml/XMLHttpRequest.cpp

Issue 14200030: Remove XMLHttpRequestException in favor of DOMException (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix tests after rebasing... 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/workers/WorkerContext.cpp ('k') | Source/core/xml/XMLHttpRequestException.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XMLHttpRequest.cpp
diff --git a/Source/core/xml/XMLHttpRequest.cpp b/Source/core/xml/XMLHttpRequest.cpp
index 6159b472c30f9ce15d21de7752ac0dcbe97acd78..467b8bcfec3b6d00fff18505a95a9237d278fcbd 100644
--- a/Source/core/xml/XMLHttpRequest.cpp
+++ b/Source/core/xml/XMLHttpRequest.cpp
@@ -55,7 +55,6 @@
#include "core/platform/network/ParsedContentType.h"
#include "core/platform/network/ResourceError.h"
#include "core/platform/network/ResourceRequest.h"
-#include "core/xml/XMLHttpRequestException.h"
#include "core/xml/XMLHttpRequestProgressEvent.h"
#include "core/xml/XMLHttpRequestUpload.h"
#include <wtf/ArrayBuffer.h>
@@ -712,7 +711,7 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
{
// Only GET request is supported for blob URL.
if (m_url.protocolIs("blob") && m_method != "GET") {
- ec = XMLHttpRequestException::NETWORK_ERR;
+ ec = NETWORK_ERR;
return;
}
@@ -788,7 +787,7 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
}
if (!m_exceptionCode && m_error)
- m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;
+ m_exceptionCode = NETWORK_ERR;
ec = m_exceptionCode;
}
@@ -1058,7 +1057,7 @@ void XMLHttpRequest::didFail(const ResourceError& error)
return;
if (error.isCancellation()) {
- m_exceptionCode = XMLHttpRequestException::ABORT_ERR;
+ m_exceptionCode = ABORT_ERR;
abortError();
return;
}
@@ -1074,7 +1073,7 @@ void XMLHttpRequest::didFail(const ResourceError& error)
if (error.domain() == errorDomainWebKitInternal)
logConsoleError(scriptExecutionContext(), "XMLHttpRequest cannot load " + error.failingURL() + ". " + error.localizedDescription());
- m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;
+ m_exceptionCode = NETWORK_ERR;
networkError();
}
@@ -1205,7 +1204,7 @@ void XMLHttpRequest::didTimeout()
clearRequest();
m_error = true;
- m_exceptionCode = XMLHttpRequestException::TIMEOUT_ERR;
+ m_exceptionCode = TIMEOUT_ERR;
if (!m_async) {
m_state = DONE;
« no previous file with comments | « Source/core/workers/WorkerContext.cpp ('k') | Source/core/xml/XMLHttpRequestException.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698