- Revision
- 147172
- Author
- commit-qu...@webkit.org
- Date
- 2013-03-28 15:39:44 -0700 (Thu, 28 Mar 2013)
Log Message
use XMLHttpRequestResponseType enumeration in XMLHttpRequest.idl
https://bugs.webkit.org/show_bug.cgi?id=113518
Patch by Arnaud Renevier <a.renev...@sisa.samsung.com> on 2013-03-28
Reviewed by Kentaro Hara.
Source/WebCore:
Use enum XMLHttpRequestResponseType type instead of DOMString for
XMLHttpRequest responseType.
Argument validation now happens in the bindings.
XMLHttpRequest::setResponseType should then never receive invalid
arguments. So, replace console message with ASSERT_NOT_REACHED();
Test: fast/xmlhttprequest/xmlhttprequest-set-responsetype.html
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::setResponseType):
* xml/XMLHttpRequest.idl:
LayoutTests:
Update xmlhttprequest-responsetype-set-invalidtype expected result:
Test all valide responseType. Remove expected console message in case
of invalid responseType. Rename to xmlhttprequest-set-responsetype
* fast/xmlhttprequest/xmlhttprequest-set-responsetype-expected.txt: Renamed from LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt.
* fast/xmlhttprequest/xmlhttprequest-set-responsetype.html: Renamed from LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype.html.
* fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt:
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (147171 => 147172)
--- trunk/LayoutTests/ChangeLog 2013-03-28 22:29:57 UTC (rev 147171)
+++ trunk/LayoutTests/ChangeLog 2013-03-28 22:39:44 UTC (rev 147172)
@@ -1,3 +1,18 @@
+2013-03-28 Arnaud Renevier <a.renev...@sisa.samsung.com>
+
+ use XMLHttpRequestResponseType enumeration in XMLHttpRequest.idl
+ https://bugs.webkit.org/show_bug.cgi?id=113518
+
+ Reviewed by Kentaro Hara.
+
+ Update xmlhttprequest-responsetype-set-invalidtype expected result:
+ Test all valide responseType. Remove expected console message in case
+ of invalid responseType. Rename to xmlhttprequest-set-responsetype
+
+ * fast/xmlhttprequest/xmlhttprequest-set-responsetype-expected.txt: Renamed from LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt.
+ * fast/xmlhttprequest/xmlhttprequest-set-responsetype.html: Renamed from LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype.html.
+ * fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt:
+
2013-03-28 Lamarque V. Souza <lamarque.so...@basyskom.com>
[css3-text] Add platform support for "wavy" text decoration style
Deleted: trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt (147171 => 147172)
--- trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt 2013-03-28 22:29:57 UTC (rev 147171)
+++ trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt 2013-03-28 22:39:44 UTC (rev 147172)
@@ -1,12 +0,0 @@
-CONSOLE MESSAGE: XMLHttpRequest.responseType "dkjdfkjdfkj" is not supported.
-CONSOLE MESSAGE: XMLHttpRequest.responseType "asdfasdfasd" is not supported.
-This test checks if setting non-supported type does not throw an exception
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS xhr.responseType = "dkjdfkjdfkj" did not throw exception.
-PASS xhr.responseType = "text"; xhr.responseType = "asdfasdfasd"; xhr.responseType is "text"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype.html (147171 => 147172)
--- trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype.html 2013-03-28 22:29:57 UTC (rev 147171)
+++ trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype.html 2013-03-28 22:39:44 UTC (rev 147172)
@@ -1,20 +0,0 @@
-<html>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script src=""
-<script>
-description('This test checks if setting non-supported type does not throw an exception');
-
-var xhr = new XMLHttpRequest();
-xhr.open('GET', 'resources/plist.app', true);
-
-// Setting invalid type should not throw an exception.
-shouldNotThrow('xhr.responseType = "dkjdfkjdfkj"');
-
-// Setting invalid type doesn not change the responseType value.
-shouldBeEqualToString('xhr.responseType = "text"; xhr.responseType = "asdfasdfasd"; xhr.responseType', 'text');
-
-</script>
-<script src=""
-</body>
Copied: trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-set-responsetype-expected.txt (from rev 147170, trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype-expected.txt) (0 => 147172)
--- trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-set-responsetype-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-set-responsetype-expected.txt 2013-03-28 22:39:44 UTC (rev 147172)
@@ -0,0 +1,15 @@
+This test checks if setting non-supported type does not throw an exception
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+PASS xhr.responseType is ""
+PASS xhr.responseType is "arraybuffer"
+PASS xhr.responseType is "blob"
+PASS xhr.responseType is "document"
+PASS xhr.responseType is "text"
+PASS xhr.responseType = "dkjdfkjdfkj" did not throw exception.
+PASS xhr.responseType = "text"; xhr.responseType = "asdfasdfasd"; xhr.responseType is "text"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-set-responsetype.html (from rev 147170, trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-responsetype-set-invalidtype.html) (0 => 147172)
--- trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-set-responsetype.html (rev 0)
+++ trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-set-responsetype.html 2013-03-28 22:39:44 UTC (rev 147172)
@@ -0,0 +1,26 @@
+<html>
+<body>
+<div id="description"></div>
+<div id="console"></div>
+<script src=""
+<script>
+description('This test checks if setting non-supported type does not throw an exception');
+
+var xhr = new XMLHttpRequest();
+xhr.open('GET', 'resources/plist.app', true);
+
+// Setting valid type does change the responseType value.
+["", "arraybuffer", "blob", "document", "text"].forEach(function(type) {
+ xhr.responseType = type;
+ shouldBeEqualToString('xhr.responseType', type);
+});
+
+// Setting invalid type should not throw an exception.
+shouldNotThrow('xhr.responseType = "dkjdfkjdfkj"');
+
+// Setting invalid type doesn not change the responseType value.
+shouldBeEqualToString('xhr.responseType = "text"; xhr.responseType = "asdfasdfasd"; xhr.responseType', 'text');
+
+</script>
+<script src=""
+</body>
Modified: trunk/Source/WebCore/ChangeLog (147171 => 147172)
--- trunk/Source/WebCore/ChangeLog 2013-03-28 22:29:57 UTC (rev 147171)
+++ trunk/Source/WebCore/ChangeLog 2013-03-28 22:39:44 UTC (rev 147172)
@@ -1,3 +1,23 @@
+2013-03-28 Arnaud Renevier <a.renev...@sisa.samsung.com>
+
+ use XMLHttpRequestResponseType enumeration in XMLHttpRequest.idl
+ https://bugs.webkit.org/show_bug.cgi?id=113518
+
+ Reviewed by Kentaro Hara.
+
+ Use enum XMLHttpRequestResponseType type instead of DOMString for
+ XMLHttpRequest responseType.
+
+ Argument validation now happens in the bindings.
+ XMLHttpRequest::setResponseType should then never receive invalid
+ arguments. So, replace console message with ASSERT_NOT_REACHED();
+
+ Test: fast/xmlhttprequest/xmlhttprequest-set-responsetype.html
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::setResponseType):
+ * xml/XMLHttpRequest.idl:
+
2013-03-28 Lamarque V. Souza <lamarque.so...@basyskom.com>
[css3-text] Add platform support for "wavy" text decoration style
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (147171 => 147172)
--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2013-03-28 22:29:57 UTC (rev 147171)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2013-03-28 22:39:44 UTC (rev 147172)
@@ -378,7 +378,7 @@
else if (responseType == "arraybuffer")
m_responseTypeCode = ResponseTypeArrayBuffer;
else
- logConsoleError(scriptExecutionContext(), "XMLHttpRequest.responseType \"" + responseType + "\" is not supported.");
+ ASSERT_NOT_REACHED();
}
String XMLHttpRequest::responseType()
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.idl (147171 => 147172)
--- trunk/Source/WebCore/xml/XMLHttpRequest.idl 2013-03-28 22:29:57 UTC (rev 147171)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.idl 2013-03-28 22:39:44 UTC (rev 147172)
@@ -26,6 +26,16 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+enum XMLHttpRequestResponseType {
+ "",
+ "arraybuffer",
+ "blob",
+ "document",
+// FIXME: enable once support for json responseText is completed. (bug #73648)
+// "json",
+ "text"
+};
+
[
ActiveDOMObject,
Constructor,
@@ -85,7 +95,7 @@
readonly attribute Document responseXML
getter raises(DOMException);
- attribute DOMString responseType
+ attribute XMLHttpRequestResponseType responseType
setter raises(DOMException);
[CustomGetter] readonly attribute Object response
getter raises(DOMException);
