Context Navigation

Changeset 173552 in webkit

Timestamp:

Sep 11, 2014, 7:27:06 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

The overrideMimeType in XMLHttpRequest should throw the exception.
https://bugs.webkit.org/show_bug.cgi?id=136699

Patch by Shivakumar JM <shiva.jm@samsung.com> on 2014-09-11
Reviewed by Darin Adler.

Source/WebCore:

No new tests, modifed test http/tests/xmlhttprequest/exceptions.html.

Set XMLHttpRequest::overrideMimeType to throw an "InvalidStateError" exception, if the state is LOADING or DONE.

(WebCore::XMLHttpRequest::overrideMimeType):

LayoutTests:

Added test to check for "InvalidStateError" exception for overrideMimeType.

Location:

trunk

Files:

-              r173548
+              r173552
+-09-11  Shivakumar JM  <shiva.jm@samsung.com>
+        The overrideMimeType in XMLHttpRequest should throw the exception.
+        https://bugs.webkit.org/show_bug.cgi?id=136699
+        Reviewed by Darin Adler.
+        Added test to check for "InvalidStateError" exception for overrideMimeType.
+        * http/tests/xmlhttprequest/exceptions-expected.txt:
+        * http/tests/xmlhttprequest/exceptions.html:
 -09-11  Chris Fleizach  <cfleizach@apple.com>

r165229	r173552
9	9	send()
10	10	PASS: req.send(null) threw exception Error: InvalidStateError: DOM Exception 11.
	11	PASS: req.overrideMimeType("text/plain") threw exception Error: InvalidStateError: DOM Exception 11.
11	12	PASS: req.setRequestHeader("Foo", "bar") threw exception Error: InvalidStateError: DOM Exception 11.
12	13	PASS: req.getResponseHeader() threw exception TypeError: Not enough arguments.

r165229	r173552
70	70
71	71	shouldThrow('req.send(null)');
	72	shouldThrow('req.overrideMimeType("text/plain")');
72	73	shouldThrow('req.setRequestHeader("Foo", "bar")');
73	74	shouldThrow('req.getResponseHeader()');

-              r173551
+              r173552
+-09-11  Shivakumar JM  <shiva.jm@samsung.com>
+        The overrideMimeType in XMLHttpRequest should throw the exception.
+        https://bugs.webkit.org/show_bug.cgi?id=136699
+        Reviewed by Darin Adler.
+        No new tests, modifed test http/tests/xmlhttprequest/exceptions.html.
+        Set XMLHttpRequest::overrideMimeType to throw an "InvalidStateError" exception, if the state is LOADING or DONE.
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::overrideMimeType):
+        * xml/XMLHttpRequest.h:
+        * xml/XMLHttpRequest.idl:
 -09-11  Joseph Pecoraro  <pecoraro@apple.com>

-              r173507
+              r173552
+}
+void XMLHttpRequest::overrideMimeType(const String& override)
+{
+void XMLHttpRequest::overrideMimeType(const String& override, ExceptionCode& ec)
+{
+    if (m_state == LOADING || m_state == DONE) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
     m_mimeTypeOverride = override;
+}

r171931	r173552
103	103	void abort();
104	104	void setRequestHeader(const String& name, const String& value, ExceptionCode&);
105		void overrideMimeType(const String& override);
	105	void overrideMimeType(const String& override, ExceptionCode&);
106	106	bool doneWithoutErrors() const { return !m_error && m_state == DONE; }
107	107	String getAllResponseHeaders() const;

r171824	r173552
92	92
93	93	// Extension
94		void overrideMimeType(DOMString override);
	94	[RaisesException] void overrideMimeType(DOMString override);
95	95
96	96	// EventTarget interface

Note: See TracChangeset for help on using the changeset viewer.