Index: Source/core/xml/XMLHttpRequest.cpp |
diff --git a/Source/core/xml/XMLHttpRequest.cpp b/Source/core/xml/XMLHttpRequest.cpp |
index 30c501640c68d1f1d7c453ae08f7ca615b3f6e22..44b8063d5a96972300e1aed4b0636b6b977c9f08 100644 |
--- a/Source/core/xml/XMLHttpRequest.cpp |
+++ b/Source/core/xml/XMLHttpRequest.cpp |
@@ -1033,12 +1033,14 @@ void XMLHttpRequest::handleRequestError(ExceptionCode exceptionCode, const Atomi |
dispatchProgressEvent(EventTypeNames::loadend, receivedLength, expectedLength); |
} |
-void XMLHttpRequest::overrideMimeType(const AtomicString& override) |
+void XMLHttpRequest::overrideMimeType(const AtomicString& mimeType, ExceptionState& exceptionState) |
{ |
- // FIXME: This method must throw an InvalidStateError exception when the |
- // XHR is in the LOADING or DONE state. http://crbug.com/402375 |
+ if (m_state == LOADING || m_state == DONE) { |
+ exceptionState.throwDOMException(InvalidStateError, "MimeType cannot be overrode when the state is LOADING or DONE."); |
tyoshino (SeeGerritForStatus)
2014/08/18 07:56:46
overrode -> overridden
kouhei (in TOK)
2014/08/18 09:29:21
Done.
|
+ return; |
+ } |
- m_mimeTypeOverride = override; |
+ m_mimeTypeOverride = mimeType; |
} |
void XMLHttpRequest::setRequestHeader(const AtomicString& name, const AtomicString& value, ExceptionState& exceptionState) |