Remove XMLHttpRequestException
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Jan 2016 16:06:32 +0000 (16:06 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 26 Jan 2016 16:06:32 +0000 (16:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=102698
<rdar://problem/24338476>

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

Update test result now that we throw DOMException.{ABORT, NETWORK, TIMEOUT}Error instead of XMLHttpRequestException.{ABORT, NETWORK, TIMEOUT}_ERR.

* web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt:
* web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt:
* web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync-expected.txt:
* web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt:
* web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt:

Source/WebCore:

Inspired by a patch by Erik Arvidsson.

As per <https://xhr.spec.whatwg.org> (21 January 2016) and <https://html.spec.whatwg.org/multipage/workers.html#dom-workerglobalscope-importscripts> (25 January 2016)
XMLHttpRequest and WorkerGlobalScope.importScripts() should throw a DOMException object instead
of a XMLHttpRequestException object when a NetworkError, AbortError, or TimeoutError occur. This
makes the behavior of WebKit more closely conform to these standards as well as the behavior of
other browsers.

* CMakeLists.txt: Remove entries for XMLHttpRequestException.idl and XMLHttpRequestException.cpp.
* DerivedSources.make: Remove entry for XMLHttpRequestException.idl.
* WebCore.order: Remove exported symbols for XMLHttpRequestException.
* WebCore.vcxproj/WebCore.vcxproj: Remove entries for JSXMLHttpRequestException.{cpp, h}, XMLHttpRequestException.{cpp, h}
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* bindings/js/JSExceptionBase.cpp:
(WebCore::toExceptionBase): Remove logic for XMLHttpRequestException.
* dom/DOMExceptions.in: Remove entry for XMLHttpRequestException.
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::importScripts): Throw DOMException.NETWORK_ERR instead of XMLHttpRequestException.NETWORK_ERR.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest): Ditto.
(WebCore::XMLHttpRequest::didFail): Throw DOMException.ABORT_ERR instead of XMLHttpRequestException.ABORT_ERR.
(WebCore::XMLHttpRequest::didReachTimeout): Throw DOMException.TIMEOUT_ERR instead of XMLHttpRequestException.TIMEOUT_ERR.
* xml/XMLHttpRequestException.cpp: Removed.
* xml/XMLHttpRequestException.h: Removed.
* xml/XMLHttpRequestException.idl: Removed.

LayoutTests:

Update test result now that we throw DOMException.{ABORT, NETWORK, TIMEOUT}Error instead of XMLHttpRequestException.{ABORT, NETWORK, TIMEOUT}_ERR.

* fast/dom/Window/resources/window-properties.js:
* fast/dom/Window/window-lookup-precedence-expected.txt:
* fast/files/apply-blob-url-to-xhr-expected.txt:
* fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt:
* http/tests/appcache/non-html.xhtml:
* http/tests/appcache/simple.html:
* http/tests/contentextensions/sync-xhr-blocked-expected.txt:
* http/tests/local/fileapi/send-sliced-dragged-file-expected.txt:
* http/tests/workers/worker-importScripts-expected.txt:
* http/tests/xmlhttprequest/XMLHttpRequestException-expected.txt:
* http/tests/xmlhttprequest/XMLHttpRequestException.html:
* http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt:
* http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt:
* http/tests/xmlhttprequest/connection-error-sync-expected.txt:
* http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
* http/tests/xmlhttprequest/origin-exact-matching-expected.txt:
* http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt:
* http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt:
* http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt:
* http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt:
* http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt:
* http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt:
* platform/efl/js/dom/global-constructors-attributes-expected.txt:
* platform/gtk/fast/dom/Window/window-lookup-precedence-expected.txt:
* platform/gtk/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
* platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
* platform/win/TestExpectations:
* platform/win/js/dom/global-constructors-attributes-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195588 268f45cc-cd09-0410-ab3c-d52691b4dbfc

57 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/dom/Window/resources/window-properties.js
LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt
LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt
LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt
LayoutTests/http/tests/appcache/non-html.xhtml
LayoutTests/http/tests/appcache/simple.html
LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt
LayoutTests/http/tests/local/fileapi/send-sliced-dragged-file-expected.txt
LayoutTests/http/tests/workers/worker-importScripts-expected.txt
LayoutTests/http/tests/xmlhttprequest/XMLHttpRequestException-expected.txt
LayoutTests/http/tests/xmlhttprequest/XMLHttpRequestException.html
LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-expected.txt
LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt
LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt
LayoutTests/http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt
LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt
LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
LayoutTests/http/tests/xmlhttprequest/connection-error-sync-expected.txt
LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt
LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt
LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt
LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt
LayoutTests/http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt
LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt
LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt
LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt
LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync-expected.txt
LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt
LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt
LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt
LayoutTests/platform/gtk/fast/dom/Window/window-lookup-precedence-expected.txt
LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt
LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt
LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt
LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt
LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/WebCore.order
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/js/JSExceptionBase.cpp
Source/WebCore/dom/DOMExceptions.in
Source/WebCore/workers/WorkerGlobalScope.cpp
Source/WebCore/xml/XMLHttpRequest.cpp
Source/WebCore/xml/XMLHttpRequestException.cpp [deleted file]
Source/WebCore/xml/XMLHttpRequestException.h [deleted file]
Source/WebCore/xml/XMLHttpRequestException.idl [deleted file]

index 06dcd55..17ac3e0 100644 (file)
@@ -1,3 +1,50 @@
+2016-01-26  Daniel Bates  <dabates@apple.com>
+
+        Remove XMLHttpRequestException
+        https://bugs.webkit.org/show_bug.cgi?id=102698
+        <rdar://problem/24338476>
+
+        Reviewed by Chris Dumez.
+
+        Update test result now that we throw DOMException.{ABORT, NETWORK, TIMEOUT}Error instead of XMLHttpRequestException.{ABORT, NETWORK, TIMEOUT}_ERR.
+
+        * fast/dom/Window/resources/window-properties.js:
+        * fast/dom/Window/window-lookup-precedence-expected.txt:
+        * fast/files/apply-blob-url-to-xhr-expected.txt:
+        * fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt:
+        * http/tests/appcache/non-html.xhtml:
+        * http/tests/appcache/simple.html:
+        * http/tests/contentextensions/sync-xhr-blocked-expected.txt:
+        * http/tests/local/fileapi/send-sliced-dragged-file-expected.txt:
+        * http/tests/workers/worker-importScripts-expected.txt:
+        * http/tests/xmlhttprequest/XMLHttpRequestException-expected.txt:
+        * http/tests/xmlhttprequest/XMLHttpRequestException.html:
+        * http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
+        * http/tests/xmlhttprequest/access-control-basic-denied-expected.txt:
+        * http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt:
+        * http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt:
+        * http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt:
+        * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt:
+        * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt:
+        * http/tests/xmlhttprequest/connection-error-sync-expected.txt:
+        * http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
+        * http/tests/xmlhttprequest/origin-exact-matching-expected.txt:
+        * http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt:
+        * http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt:
+        * http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt:
+        * http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt:
+        * http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt:
+        * http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt:
+        * platform/efl/js/dom/global-constructors-attributes-expected.txt:
+        * platform/gtk/fast/dom/Window/window-lookup-precedence-expected.txt:
+        * platform/gtk/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt:
+        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+        * platform/win/TestExpectations:
+        * platform/win/js/dom/global-constructors-attributes-expected.txt:
+
 2016-01-26  Mario Sanchez Prada  <mario@endlessm.com>
 
         [GTK] WebProcess crashes when quickly attempting many DnD operations
index aa8b35c..ab0b79c 100644 (file)
@@ -148,7 +148,6 @@ var propertyInfo = [
     ["WheelEvent", "object"],
     ["XMLDocument", "object"],
     ["XMLHttpRequest", "object"],
-    ["XMLHttpRequestException", "object"],
     ["XMLSerializer", "object"],
     ["XPathEvaluator", "object"],
     ["XPathException", "object"],
index dfa4f33..9b994d9 100644 (file)
@@ -300,8 +300,6 @@ PASS win['XMLDocument'] == '[object DocumentConstructor]' is true
 PASS win['XMLDocument'] == '[object DocumentConstructor]' is true
 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
-PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
-PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
 PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
 PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
 PASS win['XPathEvaluator'] == '[object XPathEvaluatorConstructor]' is true
index d994072..06c4e3a 100644 (file)
@@ -3,7 +3,7 @@ Test that XMLHttpRequest GET succeeds.
 Status: 200
 Response: Hello
 Test that XMLHttpRequest POST fails.
-Received exception 101: NETWORK_ERR
+Received exception 19: NetworkError
 Test that XMLHttpRequest GET fails after the blob URL is revoked.
 Status: 404
 Response: 
index d994072..06c4e3a 100644 (file)
@@ -3,7 +3,7 @@ Test that XMLHttpRequest GET succeeds.
 Status: 200
 Response: Hello
 Test that XMLHttpRequest POST fails.
-Received exception 101: NETWORK_ERR
+Received exception 19: NetworkError
 Test that XMLHttpRequest GET fails after the blob URL is revoked.
 Status: 404
 Response: 
index b70172b..d26af41 100644 (file)
@@ -46,7 +46,7 @@ function cached()
         req.open("GET", "/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/not-in-cache.txt", false);
         req.send();
     } catch (e) {
-        if (e.code == XMLHttpRequestException.NETWORK_ERR)
+        if (e.code == DOMException.NETWORK_ERR)
             hadError = true;
     }
 
index de473cf..931cf00 100644 (file)
@@ -15,7 +15,7 @@ function cached()
         req.open("GET", "resources/not-in-cache.txt", false);
         req.send();
     } catch (e) {
-        if (e.code == XMLHttpRequestException.NETWORK_ERR)
+        if (e.code == DOMException.NETWORK_ERR)
             hadError = true;
     }
 
index 580df17..0b0750d 100644 (file)
@@ -2,5 +2,5 @@ CONSOLE MESSAGE: line 21: Content blocker prevented frame displaying http://127.
 CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js. 
 Synchronous status: 0, readyState:1, responseText: 
 Synchronous status: 0, readyState:4, responseText: 
-Synchronous error: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+Synchronous error: Error: NetworkError: DOM Exception 19
 
index e7827bc..58ab33b 100644 (file)
@@ -39,7 +39,7 @@ PASS event.dataTransfer contains a File object on drop.
 PASS subfile.size is 5
 PASS subfile.type is ""
 PASS Expected response data received: OK
-PASS Expected exception thrown: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS Expected exception thrown: Error: NetworkError: DOM Exception 19
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 599454a..e43a828 100644 (file)
@@ -24,7 +24,7 @@ Loaded message from different origin
 Loaded resource 2
 PASS: all resources executed.
 Loaded resource 1
-PASS: Threw Error: NETWORK_ERR: XMLHttpRequest Exception 101 when load failed
+PASS: Threw Error: NetworkError: DOM Exception 19 when load failed
 PASS: some resources were loaded despite the network error
 Loaded resource 1
 PASS: Threw SyntaxError: Unexpected identifier 'syntax' when encountering a syntax error in imported script
index b65607a..1548c68 100644 (file)
@@ -1,10 +1,10 @@
-Tests the properties of the XMLHttpRequestException object.
+Tests the properties of the exceptions related to XMLHttpRequest.
 
-PASS e.toString() is "Error: NETWORK_ERR: XMLHttpRequest Exception 101"
-PASS Object.prototype.toString.call(e) is "[object XMLHttpRequestException]"
-FAIL Object.prototype.toString.call(e.__proto__) is not "[object XMLHttpRequestException]". Was "[object XMLHttpRequestExceptionPrototype]"
-PASS e.constructor.toString() is "[object XMLHttpRequestExceptionConstructor]"
-PASS e.constructor is window.XMLHttpRequestException
+PASS e.toString() is "Error: NetworkError: DOM Exception 19"
+PASS Object.prototype.toString.call(e) is "[object DOMException]"
+FAIL Object.prototype.toString.call(e.__proto__) is not "[object DOMException]". Was "[object DOMExceptionPrototype]"
+PASS e.constructor.toString() is "[object DOMExceptionConstructor]"
+PASS e.constructor is window.DOMException
 PASS e.NETWORK_ERR is e.constructor.NETWORK_ERR
-PASS e.NETWORK_ERR is 101
+PASS e.NETWORK_ERR is 19
 
index df239bd..2878f03 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <body>
-<p>Tests the properties of the XMLHttpRequestException object.</p>
+<p>Tests the properties of the exceptions related to XMLHttpRequest.</p>
 <pre id="console"></pre>
 <script>
     function shouldBeEqualToString(__a, __b)
         e = err;
     }
 
-    shouldBeEqualToString("e.toString()", "Error: NETWORK_ERR: XMLHttpRequest Exception 101");
-    shouldBeEqualToString("Object.prototype.toString.call(e)", "[object XMLHttpRequestException]");
-    shouldBeEqualToString("Object.prototype.toString.call(e.__proto__)", "[object XMLHttpRequestException]");
-    shouldBeEqualToString("e.constructor.toString()", "[object XMLHttpRequestExceptionConstructor]");
-    shouldBe("e.constructor", "window.XMLHttpRequestException");
+    shouldBeEqualToString("e.toString()", "Error: NetworkError: DOM Exception 19");
+    shouldBeEqualToString("Object.prototype.toString.call(e)", "[object DOMException]");
+    shouldBeEqualToString("Object.prototype.toString.call(e.__proto__)", "[object DOMException]");
+    shouldBeEqualToString("e.constructor.toString()", "[object DOMExceptionConstructor]");
+    shouldBe("e.constructor", "window.DOMException");
     shouldBe("e.NETWORK_ERR", "e.constructor.NETWORK_ERR");
-    shouldBe("e.NETWORK_ERR", "101");
+    shouldBe("e.NETWORK_ERR", "19");
 </script>
 </body>
 </html>
index 0a44df2..e5b2fe7 100644 (file)
@@ -4,20 +4,20 @@ Per the spec, these test cases should be allowed, but cross-origin redirects are
 
 Testing /resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi (sync)
 Expecting success: false
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Testing /resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi(async)
 Expecting success: true
 PASS: PASS: Cross-domain access allowed.
 
 Testing http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi (sync)
 Expecting success: false
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Testing http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi(async)
 Expecting success: false
 PASS: 0
 Testing http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi (sync)
 Expecting success: false
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Testing http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi(async)
 Expecting success: false
 PASS: 0
index 6b346a9..49b0f11 100644 (file)
@@ -1,3 +1,3 @@
 CONSOLE MESSAGE: line 24: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
+PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
 
index 340abba..97715df 100644 (file)
@@ -1,3 +1,3 @@
 CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-get-fail-non-simple.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
+PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
 
index b7756b1..0498c86 100644 (file)
@@ -1,3 +1,3 @@
 CONSOLE MESSAGE: line 42: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-non-get-allow.cgi. Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
-PASS: Exception thrown. Cross-domain access is not allowed in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
+PASS: Exception thrown. Cross-domain access is not allowed in 'send'. [NetworkError: DOM Exception 19].
 
index c5bcb5f..cbe55ee 100644 (file)
@@ -1,3 +1,3 @@
 CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-options-not-supported.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
+PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
 
index 326fd0a..72a2325 100644 (file)
@@ -6,4 +6,4 @@ This test verifies that sandboxed iframe does not have XmlHttpRequest access to
 --------
 Frame: '<!--framePath //<!--frame0-->-->'
 --------
-PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
+PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NetworkError: DOM Exception 19].
index c905789..2d1f142 100644 (file)
@@ -8,4 +8,4 @@ This test will print "PASS" on success.
 --------
 Frame: '<!--framePath //<!--frame0-->-->'
 --------
-PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
+PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NetworkError: DOM Exception 19].
index 39ea80b..9fbe414 100644 (file)
@@ -1,3 +1,3 @@
 Test the behavior of a sync XMLHttpRequest that encounters an infinite redirection loop.
 
-Exception NETWORK_ERR; code=101; number=undefined (0); message='NETWORK_ERR: XMLHttpRequest Exception 101'
+Exception NetworkError; code=19; number=undefined (0); message='NetworkError: DOM Exception 19'
index e6a6e7f..526e358 100644 (file)
@@ -10,7 +10,7 @@ PASS: Loaded, user test
 Cross-origin XMLHttpRequest (sync), authorization will not be sent, because withCredentials is false.
 PASS: 401 Authorization required
 Cross-origin XMLHttpRequest (sync), testing authorization that's not allowed by the server (withCredentials is true, but access control headers are not set).
-PASS: Got an exception. Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Got an exception. Error: NetworkError: DOM Exception 19
 Cross-origin XMLHttpRequest (sync), testing cookies.
 PASS
 Cross-origin XMLHttpRequest (async), authorization will not be sent, because withCredentials is false.
index e04506e..9ba424d 100644 (file)
@@ -58,75 +58,75 @@ PASS xhr.send(null) is undefined.
 Should allow origin: ' http://localhost:8000'
 PASS xhr.send(null) is undefined.
 Should disallow origin: 'http://www2.localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '//localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'ftp://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http:://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http:/localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http:localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000?'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000/'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000 /'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000#'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000%23'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000:80'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000, *'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'HTTP://LOCALHOST:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'HTTP://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '-'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '**'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '*'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: ''*''
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '"*"'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '* *'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '*http://*'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '*http://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '* http://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: '*, http://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'null http://localhost:8000'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://example.net'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'null'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: ''
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000/xmlhttprequest/resources/origin-exact-matching-iframe.html'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000/xmlhttprequest/resources/'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 Should disallow origin: 'http://localhost:8000/xmlhttprequest/resources/origin-exact-matching-iframe.html'
-PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
+PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 72e2ef5..b6e22e5 100644 (file)
@@ -3,7 +3,7 @@ CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest
 Tests that origin whitelisting for https does not match http URLs.
 
 Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (sync)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (async)
 PASS: 0
 
index 63b52e1..9838476 100644 (file)
@@ -3,7 +3,7 @@ CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest
 Specifying that an IP address should match subdomains doesn't make sense. This test verifies that it doesn't do anything.
 
 Testing: http://127.0.0.1:8000/xmlhttprequest/resources/get.txt (sync)
-FAIL: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL: Error: NetworkError: DOM Exception 19
 Testing: http://127.0.0.1:8000/xmlhttprequest/resources/get.txt (async)
 FAIL: 0
 
index ad7a6cb..1e5f4ba 100644 (file)
@@ -10,38 +10,38 @@ Tests the behavior of whitelisting origins and removing them later.
 
 Testing: source origin: http://127.0.0.1:8000 destination origin: http:localhost 
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
 PASS: PASS
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 
 
 Testing: source origin: http://127.0.0.1:8000 destination origin: http:localhost allowing subdomains
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
 PASS: PASS
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 
 
 Testing: source origin: http://127.0.0.1:8000 destination origin: hTtP:LoCaLhOsT allowing subdomains
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
 PASS: PASS
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 
 
 Testing: source origin: http://127.0.0.1:8000 destination origin: http: allowing subdomains
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
 PASS: PASS
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
-PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS: Error: NetworkError: DOM Exception 19
 
 
 
index c9f8c0b..8508da5 100644 (file)
@@ -2,5 +2,5 @@ CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest
 GET should not trigger a preflight request from a worker unless it has non-simple headers.
 
 PASS: Cross-domain access allowed for simple get.
-PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
+PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
 DONE
index 8db61d9..c5db01e 100644 (file)
@@ -13,7 +13,7 @@ readystatechange 4
 progress
 error
 loadend
-Error: NETWORK_ERR: XMLHttpRequest Exception 101
+Error: NetworkError: DOM Exception 19
 
 Step 3: Cross origin request, allowed
 readystatechange 4
index 52c3a1b..ecaf62f 100644 (file)
@@ -4,7 +4,7 @@ Sync XHR started.
 readyState change 1
 readyState change 4
 Error event.
-Exception: Error: NETWORK_ERR: XMLHttpRequest Exception 101
+Exception: Error: NetworkError: DOM Exception 19
 Async XHR started.
 readyState change 1
 readyState change 4
index 71b9959..cdfec82 100644 (file)
@@ -1,3 +1,19 @@
+2016-01-26  Daniel Bates  <dabates@apple.com>
+
+        Remove XMLHttpRequestException
+        https://bugs.webkit.org/show_bug.cgi?id=102698
+        <rdar://problem/24338476>
+
+        Reviewed by Chris Dumez.
+
+        Update test result now that we throw DOMException.{ABORT, NETWORK, TIMEOUT}Error instead of XMLHttpRequestException.{ABORT, NETWORK, TIMEOUT}_ERR.
+
+        * web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt:
+        * web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt:
+        * web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync-expected.txt:
+        * web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt:
+        * web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt:
+
 2016-01-25  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 
         imported/w3c/web-platform-tests/streams-api/readable-streams/garbage-collection.html asserts frequently
index 25a56ea..b5635ca 100644 (file)
@@ -1,6 +1,5 @@
 CONSOLE MESSAGE: line 24: XMLHttpRequest cannot load http://nonexistent-origin.localhost}:8800. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 32: XMLHttpRequest cannot load data:text/html;charset=utf-8;base64,PT0NUWVBFIGh0bWw%2BDQo8. Cross origin requests are only supported for HTTP.
 
-FAIL XmlHttpRequest: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set) assert_throws: function "function ()
-            {
-                xhr.send("Test ..." threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
+PASS XmlHttpRequest: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set) 
 
index 4c46230..44aace5 100644 (file)
@@ -4,9 +4,9 @@ Blocked access to external URL http://www2.localhost:8800/
 CONSOLE MESSAGE: line 18: XMLHttpRequest cannot load javascript:alert('FAIL'). Cross origin requests are only supported for HTTP.
 Blocked access to external URL http://www2.localhost:8800/folder.txt
 
-FAIL XMLHttpRequest: send() - non same-origin (mailto:test@example.org) assert_throws: function "function () { client.send() }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
-FAIL XMLHttpRequest: send() - non same-origin (tel:+31600000000) assert_throws: function "function () { client.send() }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
-FAIL XMLHttpRequest: send() - non same-origin (http://www2.localhost:8800/) assert_throws: function "function () { client.send() }" threw object "Error: ABORT_ERR: XMLHttpRequest Exception 102" that is not a DOMException NetworkError: property "code" is equal to 102, expected 19
-FAIL XMLHttpRequest: send() - non same-origin (javascript:alert('FAIL')) assert_throws: function "function () { client.send() }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
-FAIL XMLHttpRequest: send() - non same-origin (folder.txt) assert_throws: function "function () { client.send() }" threw object "Error: ABORT_ERR: XMLHttpRequest Exception 102" that is not a DOMException NetworkError: property "code" is equal to 102, expected 19
+PASS XMLHttpRequest: send() - non same-origin (mailto:test@example.org) 
+PASS XMLHttpRequest: send() - non same-origin (tel:+31600000000) 
+FAIL XMLHttpRequest: send() - non same-origin (http://www2.localhost:8800/) assert_throws: function "function () { client.send() }" threw object "Error: AbortError: DOM Exception 20" that is not a DOMException NetworkError: property "code" is equal to 20, expected 19
+PASS XMLHttpRequest: send() - non same-origin (javascript:alert('FAIL')) 
+FAIL XMLHttpRequest: send() - non same-origin (folder.txt) assert_throws: function "function () { client.send() }" threw object "Error: AbortError: DOM Exception 20" that is not a DOMException NetworkError: property "code" is equal to 20, expected 19
 
index 1316f49..2aa86b9 100644 (file)
@@ -1,7 +1,7 @@
 
-FAIL XMLHttpRequest: send() - Redirects (bogus Location header; sync) (301: foobar://abcd) assert_throws: function "function () { client.send(null) }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
-FAIL XMLHttpRequest: send() - Redirects (bogus Location header; sync) (302: http://z) assert_throws: function "function () { client.send(null) }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
-FAIL XMLHttpRequest: send() - Redirects (bogus Location header; sync) (302: mailto:someone@example.org) assert_throws: function "function () { client.send(null) }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
-FAIL XMLHttpRequest: send() - Redirects (bogus Location header; sync) (303: http://z) assert_throws: function "function () { client.send(null) }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
-FAIL XMLHttpRequest: send() - Redirects (bogus Location header; sync) (303: tel:1234567890) assert_throws: function "function () { client.send(null) }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
+PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (301: foobar://abcd) 
+PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (302: http://z) 
+PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (302: mailto:someone@example.org) 
+PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (303: http://z) 
+PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (303: tel:1234567890) 
 
index 097dcc3..29fb904 100644 (file)
@@ -1,3 +1,3 @@
 
-FAIL XMLHttpRequest: send() - Redirects (infinite loop; sync) (301) assert_throws: function "function () { client.send(null) }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
+PASS XMLHttpRequest: send() - Redirects (infinite loop; sync) (301) 
 
index 0e142f0..3b0f3c1 100644 (file)
@@ -1,3 +1,3 @@
 
-FAIL XMLHttpRequest: members during network errors (sync) assert_throws: send function "function () { client.send(null) }" threw object "Error: NETWORK_ERR: XMLHttpRequest Exception 101" that is not a DOMException NetworkError: property "code" is equal to 101, expected 19
+PASS XMLHttpRequest: members during network errors (sync) 
 
index 12e9808..908964a 100644 (file)
@@ -2078,11 +2078,6 @@ PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('g
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('set') is false
index b2b0de3..996b2b3 100644 (file)
@@ -298,8 +298,6 @@ PASS win['XMLDocument'] == '[object DocumentConstructor]' is true
 PASS win['XMLDocument'] == '[object DocumentConstructor]' is true
 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
-PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
-PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
 PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
 PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
 PASS win['XPathEvaluator'] == '[object XPathEvaluatorConstructor]' is true
index 6ccf520..88c0164 100644 (file)
@@ -2033,11 +2033,6 @@ PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('g
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('set') is false
index 04eff6f..93ebf29 100644 (file)
@@ -2073,11 +2073,6 @@ PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('g
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('set') is false
index e00e697..49b3ee6 100644 (file)
@@ -2098,11 +2098,6 @@ PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('g
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('set') is false
index b84af1d..632a1e0 100644 (file)
@@ -298,8 +298,6 @@ PASS win['XMLDocument'] == '[object XMLDocumentConstructor]' is true
 PASS win['XMLDocument'] == '[object XMLDocumentConstructor]' is true
 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
 PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
-PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
-PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
 PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
 PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
 PASS win['XPathEvaluator'] == '[object XPathEvaluatorConstructor]' is true
index d492876..954bd6b 100644 (file)
@@ -2103,11 +2103,6 @@ PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('g
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('set') is false
index 0a5c452..806d756 100644 (file)
@@ -723,9 +723,6 @@ webkit.org/b/117323 platform/win/plugins/windowless-paint-rect-coordinates.html
 # This test is dependant on DRT being able to open windows.
 fast/dom/Window/new-window-opener.html
 
-# <rdar://5667279> Undefined value exception
-http/tests/xmlhttprequest/XMLHttpRequestException.html [ Skip ]
-
 # <rdar://5670235> Sometimes spews output into the next test
 http/tests/security/cross-frame-access-put.html [ Skip ]
 
index c868735..7ea2a1c 100644 (file)
@@ -1813,11 +1813,6 @@ PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('g
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('set') is false
index e70b14f..3a7f401 100644 (file)
@@ -638,7 +638,6 @@ set(WebCore_NON_SVG_IDL_FILES
 
     xml/DOMParser.idl
     xml/XMLHttpRequest.idl
-    xml/XMLHttpRequestException.idl
     xml/XMLHttpRequestProgressEvent.idl
     xml/XMLHttpRequestUpload.idl
     xml/XMLSerializer.idl
@@ -2813,7 +2812,6 @@ set(WebCore_SOURCES
     xml/NativeXPathNSResolver.cpp
     xml/XMLErrors.cpp
     xml/XMLHttpRequest.cpp
-    xml/XMLHttpRequestException.cpp
     xml/XMLHttpRequestProgressEventThrottle.cpp
     xml/XMLHttpRequestUpload.cpp
     xml/XMLSerializer.cpp
index 83c6caa..6c2f8de 100644 (file)
@@ -1,3 +1,38 @@
+2016-01-26  Daniel Bates  <dabates@apple.com>
+
+        Remove XMLHttpRequestException
+        https://bugs.webkit.org/show_bug.cgi?id=102698
+        <rdar://problem/24338476>
+
+        Reviewed by Chris Dumez.
+
+        Inspired by a patch by Erik Arvidsson.
+
+        As per <https://xhr.spec.whatwg.org> (21 January 2016) and <https://html.spec.whatwg.org/multipage/workers.html#dom-workerglobalscope-importscripts> (25 January 2016)
+        XMLHttpRequest and WorkerGlobalScope.importScripts() should throw a DOMException object instead
+        of a XMLHttpRequestException object when a NetworkError, AbortError, or TimeoutError occur. This
+        makes the behavior of WebKit more closely conform to these standards as well as the behavior of
+        other browsers.
+
+        * CMakeLists.txt: Remove entries for XMLHttpRequestException.idl and XMLHttpRequestException.cpp.
+        * DerivedSources.make: Remove entry for XMLHttpRequestException.idl.
+        * WebCore.order: Remove exported symbols for XMLHttpRequestException.
+        * WebCore.vcxproj/WebCore.vcxproj: Remove entries for JSXMLHttpRequestException.{cpp, h}, XMLHttpRequestException.{cpp, h}
+        * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+        * WebCore.xcodeproj/project.pbxproj: Ditto.
+        * bindings/js/JSExceptionBase.cpp:
+        (WebCore::toExceptionBase): Remove logic for XMLHttpRequestException.
+        * dom/DOMExceptions.in: Remove entry for XMLHttpRequestException.
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::importScripts): Throw DOMException.NETWORK_ERR instead of XMLHttpRequestException.NETWORK_ERR.
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::createRequest): Ditto.
+        (WebCore::XMLHttpRequest::didFail): Throw DOMException.ABORT_ERR instead of XMLHttpRequestException.ABORT_ERR.
+        (WebCore::XMLHttpRequest::didReachTimeout): Throw DOMException.TIMEOUT_ERR instead of XMLHttpRequestException.TIMEOUT_ERR.
+        * xml/XMLHttpRequestException.cpp: Removed.
+        * xml/XMLHttpRequestException.h: Removed.
+        * xml/XMLHttpRequestException.idl: Removed.
+
 2016-01-25  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 
         WebCoreJSBuiltins do not use to do conditional include
index 26173d2..584ac42 100644 (file)
@@ -538,7 +538,6 @@ NON_SVG_BINDING_IDLS = \
     $(WebCore)/workers/WorkerLocation.idl \
     $(WebCore)/xml/DOMParser.idl \
     $(WebCore)/xml/XMLHttpRequest.idl \
-    $(WebCore)/xml/XMLHttpRequestException.idl \
     $(WebCore)/xml/XMLHttpRequestProgressEvent.idl \
     $(WebCore)/xml/XMLHttpRequestUpload.idl \
     $(WebCore)/xml/XMLSerializer.idl \
index 2dbc1a0..bedf194 100644 (file)
@@ -6110,7 +6110,6 @@ __ZN7WebCore13FileException21initializeDescriptionEiPNS_24ExceptionCodeDescripti
 __ZN7WebCore14RangeException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
 __ZN7WebCore12SQLException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
 __ZN7WebCore12SVGException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
-__ZN7WebCore23XMLHttpRequestException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
 __ZN7WebCore14XPathException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
 __ZN7WebCore16DOMCoreException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
 __ZN7WebCore13ExceptionBaseC2ERKNS_24ExceptionCodeDescriptionE
@@ -11054,7 +11053,6 @@ __ZN7WebCore15toExceptionBaseEN3JSC7JSValueE
 __ZN7WebCore18toDOMCoreExceptionEN3JSC7JSValueE
 __ZN7WebCore16toRangeExceptionEN3JSC7JSValueE
 __ZN7WebCore16toEventExceptionEN3JSC7JSValueE
-__ZN7WebCore25toXMLHttpRequestExceptionEN3JSC7JSValueE
 __ZN7WebCore14toSVGExceptionEN3JSC7JSValueE
 __ZN7WebCore16toXPathExceptionEN3JSC7JSValueE
 __ZN7WebCore14toSQLExceptionEN3JSC7JSValueE
@@ -13289,15 +13287,6 @@ __ZN7WebCore22ThreadableLoaderClient25didFailAccessControlCheckERKNS_13ResourceE
 __ZThn168_N7WebCore8Document17addConsoleMessageENS_13MessageSourceENS_12MessageLevelERKN3WTF6StringEm
 __ZN7WebCore8Document17addConsoleMessageENS_13MessageSourceENS_12MessageLevelERKN3WTF6StringEm
 __ZN7WebCore14XMLHttpRequest12networkErrorEv
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_23XMLHttpRequestExceptionE
-__ZN7WebCore15getDOMStructureINS_25JSXMLHttpRequestExceptionEEEPN3JSC9StructureEPNS2_9ExecStateEPNS_17JSDOMGlobalObjectE
-__ZN7WebCore25JSXMLHttpRequestException15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
-__ZN7WebCore12cacheWrapperINS_23XMLHttpRequestExceptionEEEvPNS_15DOMWrapperWorldEPT_PNS_12JSDOMWrapperE
-__ZN7WebCore25JSXMLHttpRequestException18getOwnPropertySlotEPN3JSC6JSCellEPNS1_9ExecStateENS1_12PropertyNameERNS1_12PropertySlotE
-__ZN3JSC18getStaticValueSlotIN7WebCore25JSXMLHttpRequestExceptionENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_NS_12PropertyNameERNS_12PropertySlotE
-__ZN7WebCore34JSXMLHttpRequestExceptionPrototype18getOwnPropertySlotEPN3JSC6JSCellEPNS1_9ExecStateENS1_12PropertyNameERNS1_12PropertySlotE
-__ZN3JSC21getStaticPropertySlotIN7WebCore34JSXMLHttpRequestExceptionPrototypeENS_8JSObjectEEEbPNS_9ExecStateEPKNS_9HashTableEPT_NS_12PropertyNameERNS_12PropertySlotE
-__ZN7WebCore50jsXMLHttpRequestExceptionPrototypeFunctionToStringEPN3JSC9ExecStateE
 __ZNK7WebCore13ExceptionBase8toStringEv
 __ZN7WebCore14jsHistoryStateEPN3JSC9ExecStateENS0_7JSValueENS0_12PropertyNameE
 __ZNK7WebCore9JSHistory5stateEPN3JSC9ExecStateE
@@ -23149,13 +23138,6 @@ __ZTVN7WebCore21JSXMLHttpRequestOwnerE
 __ZN7WebCoreL27JSXMLHttpRequestTableValuesE
 __ZN7WebCoreL36JSXMLHttpRequestPrototypeTableValuesE
 __ZN7WebCoreL38JSXMLHttpRequestConstructorTableValuesE
-__ZN7WebCore36JSXMLHttpRequestExceptionConstructor6s_infoE
-__ZN7WebCore34JSXMLHttpRequestExceptionPrototype6s_infoE
-__ZN7WebCore25JSXMLHttpRequestException6s_infoE
-__ZTVN7WebCore30JSXMLHttpRequestExceptionOwnerE
-__ZN7WebCoreL36JSXMLHttpRequestExceptionTableValuesE
-__ZN7WebCoreL45JSXMLHttpRequestExceptionPrototypeTableValuesE
-__ZN7WebCoreL47JSXMLHttpRequestExceptionConstructorTableValuesE
 __ZN7WebCore40JSXMLHttpRequestProgressEventConstructor6s_infoE
 __ZN7WebCore38JSXMLHttpRequestProgressEventPrototype6s_infoE
 __ZN7WebCore29JSXMLHttpRequestProgressEvent6s_infoE
@@ -25940,11 +25922,6 @@ __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_15WorkerNavigatorEE22jsW
 __ZN7WebCoreL21JSXMLHttpRequestTableE
 __ZN7WebCoreL30JSXMLHttpRequestPrototypeTableE
 __ZN7WebCoreL32JSXMLHttpRequestConstructorTableE
-__ZN7WebCoreL30JSXMLHttpRequestExceptionTableE
-__ZN7WebCoreL39JSXMLHttpRequestExceptionPrototypeTableE
-__ZN7WebCoreL41JSXMLHttpRequestExceptionConstructorTableE
-__ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_23XMLHttpRequestExceptionEE30jsXMLHttpRequestExceptionOwner
-__ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_23XMLHttpRequestExceptionEE30jsXMLHttpRequestExceptionOwner
 __ZN7WebCoreL34JSXMLHttpRequestProgressEventTableE
 __ZN7WebCoreL43JSXMLHttpRequestProgressEventPrototypeTableE
 __ZN7WebCoreL45JSXMLHttpRequestProgressEventConstructorTableE
index 179e66e..5ba06d6 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestProgressEvent.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     <ClCompile Include="..\xml\NativeXPathNSResolver.cpp" />
     <ClCompile Include="..\xml\XMLErrors.cpp" />
     <ClCompile Include="..\xml\XMLHttpRequest.cpp" />
-    <ClCompile Include="..\xml\XMLHttpRequestException.cpp" />
     <ClCompile Include="..\xml\XMLHttpRequestProgressEventThrottle.cpp" />
     <ClCompile Include="..\xml\XMLHttpRequestUpload.cpp" />
     <ClCompile Include="..\xml\XMLSerializer.cpp" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSWorkerNavigator.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLDocument.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestProgressEvent.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestUpload.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLSerializer.h" />
     <ClInclude Include="..\xml\NativeXPathNSResolver.h" />
     <ClInclude Include="..\xml\XMLErrors.h" />
     <ClInclude Include="..\xml\XMLHttpRequest.h" />
-    <ClInclude Include="..\xml\XMLHttpRequestException.h" />
     <ClInclude Include="..\xml\XMLHttpRequestProgressEvent.h" />
     <ClInclude Include="..\xml\XMLHttpRequestProgressEventThrottle.h" />
     <ClInclude Include="..\xml\XMLHttpRequestUpload.h" />
index 171c40c..681016b 100644 (file)
     <ClCompile Include="..\xml\XMLHttpRequest.cpp">
       <Filter>xml</Filter>
     </ClCompile>
-    <ClCompile Include="..\xml\XMLHttpRequestException.cpp">
-      <Filter>xml</Filter>
-    </ClCompile>
     <ClCompile Include="..\xml\XMLHttpRequestProgressEventThrottle.cpp">
       <Filter>xml</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.cpp">
-      <Filter>DerivedSources</Filter>
-    </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestProgressEvent.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClInclude Include="..\xml\XMLHttpRequest.h">
       <Filter>xml</Filter>
     </ClInclude>
-    <ClInclude Include="..\xml\XMLHttpRequestException.h">
-      <Filter>xml</Filter>
-    </ClInclude>
     <ClInclude Include="..\xml\XMLHttpRequestProgressEvent.h">
       <Filter>xml</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.h">
-      <Filter>DerivedSources</Filter>
-    </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestProgressEvent.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
index bb713e2..fc5d1d7 100644 (file)
                978D07BE145A0F6C0096908D /* DOMCoreException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 978D07BD145A0F6C0096908D /* DOMCoreException.cpp */; };
                978D07CA145A10160096908D /* SVGException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 978D07C9145A10160096908D /* SVGException.cpp */; };
                978D07CC145A102E0096908D /* XPathException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 978D07CB145A102E0096908D /* XPathException.cpp */; };
-               978D07CE145A10370096908D /* XMLHttpRequestException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 978D07CD145A10370096908D /* XMLHttpRequestException.cpp */; };
                979F43D31075E44A0000F83B /* NavigationScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 979F43D11075E44A0000F83B /* NavigationScheduler.cpp */; };
                979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 979F43D21075E44A0000F83B /* NavigationScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                97AA3CA5145237CC003E1DA6 /* EventTargetHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AA3CA3145237CC003E1DA6 /* EventTargetHeaders.h */; };
                BC60D8F20D2A11E000B9918F /* ExceptionBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60D8F00D2A11E000B9918F /* ExceptionBase.cpp */; };
                BC60D8F30D2A11E000B9918F /* ExceptionBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D8F10D2A11E000B9918F /* ExceptionBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC60D90C0D2A17CE00B9918F /* EventException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D9090D2A17CE00B9918F /* EventException.h */; };
-               BC60D9C90D2A29E500B9918F /* XMLHttpRequestException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D9C70D2A29E500B9918F /* XMLHttpRequestException.h */; };
-               BC60DA390D2A302800B9918F /* JSXMLHttpRequestException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60DA370D2A302800B9918F /* JSXMLHttpRequestException.cpp */; };
-               BC60DA3A0D2A302800B9918F /* JSXMLHttpRequestException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DA380D2A302800B9918F /* JSXMLHttpRequestException.h */; };
                BC60DA5B0D2A31F700B9918F /* XPathException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DA590D2A31F700B9918F /* XPathException.h */; };
                BC60DB490D2A3D1E00B9918F /* JSXPathException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60DB470D2A3D1E00B9918F /* JSXPathException.cpp */; };
                BC60DB4A0D2A3D1E00B9918F /* JSXPathException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DB480D2A3D1E00B9918F /* JSXPathException.h */; };
                978D07BD145A0F6C0096908D /* DOMCoreException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMCoreException.cpp; sourceTree = "<group>"; };
                978D07C9145A10160096908D /* SVGException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGException.cpp; sourceTree = "<group>"; };
                978D07CB145A102E0096908D /* XPathException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathException.cpp; sourceTree = "<group>"; };
-               978D07CD145A10370096908D /* XMLHttpRequestException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLHttpRequestException.cpp; sourceTree = "<group>"; };
                979F43D11075E44A0000F83B /* NavigationScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationScheduler.cpp; sourceTree = "<group>"; };
                979F43D21075E44A0000F83B /* NavigationScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationScheduler.h; sourceTree = "<group>"; };
                97AA3CA3145237CC003E1DA6 /* EventTargetHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTargetHeaders.h; sourceTree = "<group>"; };
                BC60D8F10D2A11E000B9918F /* ExceptionBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionBase.h; sourceTree = "<group>"; };
                BC60D9090D2A17CE00B9918F /* EventException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventException.h; sourceTree = "<group>"; };
                BC60D90A0D2A17CE00B9918F /* EventException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventException.idl; sourceTree = "<group>"; };
-               BC60D9C70D2A29E500B9918F /* XMLHttpRequestException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestException.h; sourceTree = "<group>"; };
-               BC60D9C80D2A29E500B9918F /* XMLHttpRequestException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XMLHttpRequestException.idl; sourceTree = "<group>"; };
-               BC60DA370D2A302800B9918F /* JSXMLHttpRequestException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequestException.cpp; sourceTree = "<group>"; };
-               BC60DA380D2A302800B9918F /* JSXMLHttpRequestException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXMLHttpRequestException.h; sourceTree = "<group>"; };
                BC60DA590D2A31F700B9918F /* XPathException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathException.h; sourceTree = "<group>"; };
                BC60DA5A0D2A31F700B9918F /* XPathException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XPathException.idl; sourceTree = "<group>"; };
                BC60DB470D2A3D1E00B9918F /* JSXPathException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXPathException.cpp; sourceTree = "<group>"; };
                                1ACE53DE0A8D18810022947D /* JSDOMParser.h */,
                                BC348BD10DB7F804004ABAB9 /* JSXMLHttpRequest.cpp */,
                                BC348BD20DB7F804004ABAB9 /* JSXMLHttpRequest.h */,
-                               BC60DA370D2A302800B9918F /* JSXMLHttpRequestException.cpp */,
-                               BC60DA380D2A302800B9918F /* JSXMLHttpRequestException.h */,
                                F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */,
                                F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */,
                                BCDFD4930E30592F009D10AD /* JSXMLHttpRequestUpload.cpp */,
                                BC772C440C4EB2C60083285F /* XMLHttpRequest.cpp */,
                                BC772C450C4EB2C60083285F /* XMLHttpRequest.h */,
                                BC348BA70DB7F1B8004ABAB9 /* XMLHttpRequest.idl */,
-                               978D07CD145A10370096908D /* XMLHttpRequestException.cpp */,
-                               BC60D9C70D2A29E500B9918F /* XMLHttpRequestException.h */,
-                               BC60D9C80D2A29E500B9918F /* XMLHttpRequestException.idl */,
                                F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */,
                                F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */,
                                A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */,
                                E1271A580EEECDE400F61213 /* JSWorkerNavigator.h in Headers */,
                                7C4C96DD1AD4483500365A60 /* JSWritableStream.h in Headers */,
                                BC348BD40DB7F804004ABAB9 /* JSXMLHttpRequest.h in Headers */,
-                               BC60DA3A0D2A302800B9918F /* JSXMLHttpRequestException.h in Headers */,
                                F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */,
                                BCDFD4960E30592F009D10AD /* JSXMLHttpRequestUpload.h in Headers */,
                                1ACE53F70A8D19470022947D /* JSXMLSerializer.h in Headers */,
                                00B9318C13BA8DCC0035A948 /* XMLDocumentParserScope.h in Headers */,
                                59C28046138DC2410079B7E2 /* XMLErrors.h in Headers */,
                                BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */,
-                               BC60D9C90D2A29E500B9918F /* XMLHttpRequestException.h in Headers */,
                                F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */,
                                A136A00D1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h in Headers */,
                                BCDFD48E0E305290009D10AD /* XMLHttpRequestUpload.h in Headers */,
                                7C4C96DC1AD4483500365A60 /* JSWritableStream.cpp in Sources */,
                                BC348BD30DB7F804004ABAB9 /* JSXMLHttpRequest.cpp in Sources */,
                                BC348BBE0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp in Sources */,
-                               BC60DA390D2A302800B9918F /* JSXMLHttpRequestException.cpp in Sources */,
                                F916C48D0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp in Sources */,
                                BCDFD4950E30592F009D10AD /* JSXMLHttpRequestUpload.cpp in Sources */,
                                1ACE53F60A8D19470022947D /* JSXMLSerializer.cpp in Sources */,
                                00B9318B13BA8DC90035A948 /* XMLDocumentParserScope.cpp in Sources */,
                                59C28045138DC2410079B7E2 /* XMLErrors.cpp in Sources */,
                                BC772C460C4EB2C60083285F /* XMLHttpRequest.cpp in Sources */,
-                               978D07CE145A10370096908D /* XMLHttpRequestException.cpp in Sources */,
                                A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */,
                                BCDFD48F0E305290009D10AD /* XMLHttpRequestUpload.cpp in Sources */,
                                A833C80C0A2CF25600D57664 /* XMLNames.cpp in Sources */,
index dd629d2..dde1470 100644 (file)
@@ -29,7 +29,6 @@
 #include "JSDOMCoreException.h"
 #include "JSSQLException.h"
 #include "JSSVGException.h"
-#include "JSXMLHttpRequestException.h"
 #include "JSXPathException.h"
 #include "SQLException.h"
 
@@ -39,8 +38,6 @@ ExceptionBase* toExceptionBase(JSC::JSValue value)
 {
     if (DOMCoreException* domException = JSDOMCoreException::toWrapped(value))
         return reinterpret_cast<ExceptionBase*>(domException);
-    if (XMLHttpRequestException* xmlHttpException = JSXMLHttpRequestException::toWrapped(value))
-        return reinterpret_cast<ExceptionBase*>(xmlHttpException);
     if (SVGException* svgException = JSSVGException::toWrapped(value))
         return reinterpret_cast<ExceptionBase*>(svgException);
     if (XPathException* pathException = JSXPathException::toWrapped(value))
index 6eabe16..6148e86 100644 (file)
@@ -4,6 +4,5 @@ DOMCoreException
 FileException
 SQLException
 SVGException
-XMLHttpRequestException
 XPathException
 
index 0020408..3027a52 100644 (file)
@@ -49,7 +49,6 @@
 #include "WorkerScriptLoader.h"
 #include "WorkerThread.h"
 #include "WorkerThreadableLoader.h"
-#include "XMLHttpRequestException.h"
 #include <bindings/ScriptValue.h>
 #include <inspector/ConsoleMessage.h>
 #include <inspector/ScriptCallStack.h>
@@ -188,7 +187,7 @@ void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionCode&
 
         // If the fetching attempt failed, throw a NETWORK_ERR exception and abort all these steps.
         if (scriptLoader->failed()) {
-            ec = XMLHttpRequestException::NETWORK_ERR;
+            ec = NETWORK_ERR;
             return;
         }
 
index db2fb8a..570bbdc 100644 (file)
@@ -48,7 +48,6 @@
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
 #include "ThreadableLoader.h"
-#include "XMLHttpRequestException.h"
 #include "XMLHttpRequestProgressEvent.h"
 #include "XMLHttpRequestUpload.h"
 #include "markup.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;
     }
 
@@ -796,7 +795,7 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec)
     }
 
     if (!m_exceptionCode && m_error)
-        m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;
+        m_exceptionCode = NETWORK_ERR;
     ec = m_exceptionCode;
 }
 
@@ -1066,7 +1065,7 @@ void XMLHttpRequest::didFail(const ResourceError& error)
         return;
 
     if (error.isCancellation()) {
-        m_exceptionCode = XMLHttpRequestException::ABORT_ERR;
+        m_exceptionCode = ABORT_ERR;
         abortError();
         return;
     }
@@ -1083,7 +1082,7 @@ void XMLHttpRequest::didFail(const ResourceError& error)
         logConsoleError(scriptExecutionContext(), message);
     }
 
-    m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;
+    m_exceptionCode = NETWORK_ERR;
     networkError();
 }
 
@@ -1236,7 +1235,7 @@ void XMLHttpRequest::didReachTimeout()
 
     m_sendFlag = false;
     m_error = true;
-    m_exceptionCode = XMLHttpRequestException::TIMEOUT_ERR;
+    m_exceptionCode = TIMEOUT_ERR;
 
     if (!m_async) {
         m_state = DONE;
diff --git a/Source/WebCore/xml/XMLHttpRequestException.cpp b/Source/WebCore/xml/XMLHttpRequestException.cpp
deleted file mode 100644 (file)
index 7a3c67f..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "XMLHttpRequestException.h"
-
-#include "ExceptionCodeDescription.h"
-
-namespace WebCore {
-
-static struct XMLHttpRequestExceptionNameDescription {
-    const char* const name;
-    const char* const description;
-} exceptions[] = {
-    { "NETWORK_ERR", "A network error occurred in synchronous requests." },
-    { "ABORT_ERR", "The user aborted a request in synchronous requests." },
-    { "TIMEOUT_ERR", "A timeout error occured in synchronous requests." }
-};
-
-bool XMLHttpRequestException::initializeDescription(ExceptionCode ec, ExceptionCodeDescription* description)
-{
-    if (ec < XMLHttpRequestExceptionOffset || ec > XMLHttpRequestExceptionMax)
-        return false;
-
-    description->typeName = "XMLHttpRequest";
-    description->code = ec - XMLHttpRequestExceptionOffset;
-    description->type = XMLHttpRequestExceptionType;
-
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
-    size_t tableIndex = ec - NETWORK_ERR;
-
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
-
-    return true;
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/xml/XMLHttpRequestException.h b/Source/WebCore/xml/XMLHttpRequestException.h
deleted file mode 100644 (file)
index d6dc8d6..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef XMLHttpRequestException_h
-#define XMLHttpRequestException_h
-
-#include "ExceptionBase.h"
-
-namespace WebCore {
-
-class XMLHttpRequestException : public ExceptionBase {
-public:
-    static Ref<XMLHttpRequestException> create(const ExceptionCodeDescription& description)
-    {
-        return adoptRef(*new XMLHttpRequestException(description));
-    }
-
-    static const int XMLHttpRequestExceptionOffset = 500;
-    static const int XMLHttpRequestExceptionMax = 699;
-
-    enum XMLHttpRequestExceptionCode {
-        NETWORK_ERR = XMLHttpRequestExceptionOffset + 101,
-        ABORT_ERR,
-        TIMEOUT_ERR
-    };
-
-    static bool initializeDescription(ExceptionCode, ExceptionCodeDescription*);
-
-private:
-    explicit XMLHttpRequestException(const ExceptionCodeDescription& description)
-        : ExceptionBase(description)
-    {
-    }
-};
-
-} // namespace WebCore
-
-#endif // XMLHttpRequestException_h
diff --git a/Source/WebCore/xml/XMLHttpRequestException.idl b/Source/WebCore/xml/XMLHttpRequestException.idl
deleted file mode 100644 (file)
index f06941a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
-    DoNotCheckConstants,
-    ImplementationLacksVTable,
-] exception XMLHttpRequestException {
-
-    readonly attribute unsigned short   code;
-    readonly attribute DOMString        name;
-    readonly attribute DOMString        message;
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    // Override in a Mozilla compatible format
-    [NotEnumerable] DOMString toString();
-#endif
-
-    // XMLHttpRequestExceptionCode
-    const unsigned short NETWORK_ERR = 101;
-    const unsigned short ABORT_ERR = 102;
-};
-