Changeset 195588 in webkit


Ignore:
Timestamp:
Jan 26, 2016 8:06:32 AM (8 years ago)
Author:
dbates@webkit.org
Message:

Remove XMLHttpRequestException
​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:
Location:
trunk
Files:
3 deleted
54 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r195586 r195588  
     12016-01-26  Daniel Bates  <dabates@apple.com>
     2
     3        Remove XMLHttpRequestException
     4        https://bugs.webkit.org/show_bug.cgi?id=102698
     5        <rdar://problem/24338476>
     6
     7        Reviewed by Chris Dumez.
     8
     9        Update test result now that we throw DOMException.{ABORT, NETWORK, TIMEOUT}Error instead of XMLHttpRequestException.{ABORT, NETWORK, TIMEOUT}_ERR.
     10
     11        * fast/dom/Window/resources/window-properties.js:
     12        * fast/dom/Window/window-lookup-precedence-expected.txt:
     13        * fast/files/apply-blob-url-to-xhr-expected.txt:
     14        * fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt:
     15        * http/tests/appcache/non-html.xhtml:
     16        * http/tests/appcache/simple.html:
     17        * http/tests/contentextensions/sync-xhr-blocked-expected.txt:
     18        * http/tests/local/fileapi/send-sliced-dragged-file-expected.txt:
     19        * http/tests/workers/worker-importScripts-expected.txt:
     20        * http/tests/xmlhttprequest/XMLHttpRequestException-expected.txt:
     21        * http/tests/xmlhttprequest/XMLHttpRequestException.html:
     22        * http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
     23        * http/tests/xmlhttprequest/access-control-basic-denied-expected.txt:
     24        * http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt:
     25        * http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt:
     26        * http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt:
     27        * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt:
     28        * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt:
     29        * http/tests/xmlhttprequest/connection-error-sync-expected.txt:
     30        * http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
     31        * http/tests/xmlhttprequest/origin-exact-matching-expected.txt:
     32        * http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt:
     33        * http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt:
     34        * http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt:
     35        * http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt:
     36        * http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt:
     37        * http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt:
     38        * platform/efl/js/dom/global-constructors-attributes-expected.txt:
     39        * platform/gtk/fast/dom/Window/window-lookup-precedence-expected.txt:
     40        * platform/gtk/js/dom/global-constructors-attributes-expected.txt:
     41        * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
     42        * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
     43        * platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt:
     44        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
     45        * platform/win/TestExpectations:
     46        * platform/win/js/dom/global-constructors-attributes-expected.txt:
     47
    1482016-01-26  Mario Sanchez Prada  <mario@endlessm.com>
    249

  • trunk/LayoutTests/fast/dom/Window/resources/window-properties.js

    r191423 r195588  
    149149    ["XMLDocument", "object"],
    150150    ["XMLHttpRequest", "object"],
    151     ["XMLHttpRequestException", "object"],
    152151    ["XMLSerializer", "object"],
    153152    ["XPathEvaluator", "object"],

  • trunk/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt

    r191423 r195588  
    301301PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
    302302PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
    303 PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
    304 PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
    305303PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
    306304PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true

  • trunk/LayoutTests/fast/files/apply-blob-url-to-xhr-expected.txt

    r66690 r195588  
    44Response: Hello
    55Test that XMLHttpRequest POST fails.
    6 Received exception 101: NETWORK_ERR
     6Received exception 19: NetworkError
    77Test that XMLHttpRequest GET fails after the blob URL is revoked.
    88Status: 404

  • trunk/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr-expected.txt

    r66690 r195588  
    44Response: Hello
    55Test that XMLHttpRequest POST fails.
    6 Received exception 101: NETWORK_ERR
     6Received exception 19: NetworkError
    77Test that XMLHttpRequest GET fails after the blob URL is revoked.
    88Status: 404

  • trunk/LayoutTests/http/tests/appcache/non-html.xhtml

    r175841 r195588  
    4747        req.send();
    4848    } catch (e) {
    49         if (e.code == XMLHttpRequestException.NETWORK_ERR)
     49        if (e.code == DOMException.NETWORK_ERR)
    5050            hadError = true;
    5151    }

  • trunk/LayoutTests/http/tests/appcache/simple.html

    r120167 r195588  
    1616        req.send();
    1717    } catch (e) {
    18         if (e.code == XMLHttpRequestException.NETWORK_ERR)
     18        if (e.code == DOMException.NETWORK_ERR)
    1919            hadError = true;
    2020    }

  • trunk/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt

    r186228 r195588  
    33Synchronous status: 0, readyState:1, responseText:
    44Synchronous status: 0, readyState:4, responseText:
    5 Synchronous error: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     5Synchronous error: Error: NetworkError: DOM Exception 19
    66

  • trunk/LayoutTests/http/tests/local/fileapi/send-sliced-dragged-file-expected.txt

    r72340 r195588  
    4040PASS subfile.type is ""
    4141PASS Expected response data received: OK
    42 PASS Expected exception thrown: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     42PASS Expected exception thrown: Error: NetworkError: DOM Exception 19
    4343PASS successfullyParsed is true
    4444

  • trunk/LayoutTests/http/tests/workers/worker-importScripts-expected.txt

    r158014 r195588  
    2525PASS: all resources executed.
    2626Loaded resource 1
    27 PASS: Threw Error: NETWORK_ERR: XMLHttpRequest Exception 101 when load failed
     27PASS: Threw Error: NetworkError: DOM Exception 19 when load failed
    2828PASS: some resources were loaded despite the network error
    2929Loaded resource 1

  • trunk/LayoutTests/http/tests/xmlhttprequest/XMLHttpRequestException-expected.txt

    r29073 r195588  
    1 Tests the properties of the XMLHttpRequestException object.
     1Tests the properties of the exceptions related to XMLHttpRequest.
    22
    3 PASS e.toString() is "Error: NETWORK_ERR: XMLHttpRequest Exception 101"
    4 PASS Object.prototype.toString.call(e) is "[object XMLHttpRequestException]"
    5 FAIL Object.prototype.toString.call(e.__proto__) is not "[object XMLHttpRequestException]". Was "[object XMLHttpRequestExceptionPrototype]"
    6 PASS e.constructor.toString() is "[object XMLHttpRequestExceptionConstructor]"
    7 PASS e.constructor is window.XMLHttpRequestException
     3PASS e.toString() is "Error: NetworkError: DOM Exception 19"
     4PASS Object.prototype.toString.call(e) is "[object DOMException]"
     5FAIL Object.prototype.toString.call(e.__proto__) is not "[object DOMException]". Was "[object DOMExceptionPrototype]"
     6PASS e.constructor.toString() is "[object DOMExceptionConstructor]"
     7PASS e.constructor is window.DOMException
    88PASS e.NETWORK_ERR is e.constructor.NETWORK_ERR
    9 PASS e.NETWORK_ERR is 101
     9PASS e.NETWORK_ERR is 19
    1010

  • trunk/LayoutTests/http/tests/xmlhttprequest/XMLHttpRequestException.html

    r120167 r195588  
    11<html>
    22<body>
    3 <p>Tests the properties of the XMLHttpRequestException object.</p>
     3<p>Tests the properties of the exceptions related to XMLHttpRequest.</p>
    44<pre id="console"></pre>
    55<script>
    … …  
    4444    }
    4545
    46     shouldBeEqualToString("e.toString()", "Error: NETWORK_ERR: XMLHttpRequest Exception 101");
    47     shouldBeEqualToString("Object.prototype.toString.call(e)", "[object XMLHttpRequestException]");
    48     shouldBeEqualToString("Object.prototype.toString.call(e.__proto__)", "[object XMLHttpRequestException]");
    49     shouldBeEqualToString("e.constructor.toString()", "[object XMLHttpRequestExceptionConstructor]");
    50     shouldBe("e.constructor", "window.XMLHttpRequestException");
     46    shouldBeEqualToString("e.toString()", "Error: NetworkError: DOM Exception 19");
     47    shouldBeEqualToString("Object.prototype.toString.call(e)", "[object DOMException]");
     48    shouldBeEqualToString("Object.prototype.toString.call(e.__proto__)", "[object DOMException]");
     49    shouldBeEqualToString("e.constructor.toString()", "[object DOMExceptionConstructor]");
     50    shouldBe("e.constructor", "window.DOMException");
    5151    shouldBe("e.NETWORK_ERR", "e.constructor.NETWORK_ERR");
    52     shouldBe("e.NETWORK_ERR", "101");
     52    shouldBe("e.NETWORK_ERR", "19");
    5353</script>
    5454</body>

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt

    r195010 r195588  
    55Testing /resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi (sync)
    66Expecting success: false
    7 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     7PASS: Error: NetworkError: DOM Exception 19
    88Testing /resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi(async)
    99Expecting success: true
    … …  
    1212Testing http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi (sync)
    1313Expecting success: false
    14 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     14PASS: Error: NetworkError: DOM Exception 19
    1515Testing http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi(async)
    1616Expecting success: false
    … …  
    1818Testing http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi (sync)
    1919Expecting success: false
    20 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     20PASS: Error: NetworkError: DOM Exception 19
    2121Testing http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi(async)
    2222Expecting success: false

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-expected.txt

    r178527 r195588  
    11CONSOLE 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.
    2 PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
     2PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt

    r178527 r195588  
    11CONSOLE 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.
    2 PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
     2PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt

    r178527 r195588  
    11CONSOLE 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.
    2 PASS: Exception thrown. Cross-domain access is not allowed in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
     2PASS: Exception thrown. Cross-domain access is not allowed in 'send'. [NetworkError: DOM Exception 19].
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt

    r178527 r195588  
    11CONSOLE 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.
    2 PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
     2PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt

    r195100 r195588  
    77Frame: '<!--framePath //<!--frame0-->-->'
    88--------
    9 PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
     9PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NetworkError: DOM Exception 19].

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt

    r195100 r195588  
    99Frame: '<!--framePath //<!--frame0-->-->'
    1010--------
    11 PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
     11PASS: Exception thrown. Sandboxed iframe XHR access was denied in 'send'. [NetworkError: DOM Exception 19].

  • trunk/LayoutTests/http/tests/xmlhttprequest/connection-error-sync-expected.txt

    r29058 r195588  
    11Test the behavior of a sync XMLHttpRequest that encounters an infinite redirection loop.
    22
    3 Exception NETWORK_ERR; code=101; number=undefined (0); message='NETWORK_ERR: XMLHttpRequest Exception 101'
     3Exception NetworkError; code=19; number=undefined (0); message='NetworkError: DOM Exception 19'

  • trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt

    r178527 r195588  
    1111PASS: 401 Authorization required
    1212Cross-origin XMLHttpRequest (sync), testing authorization that's not allowed by the server (withCredentials is true, but access control headers are not set).
    13 PASS: Got an exception. Error: NETWORK_ERR: XMLHttpRequest Exception 101
     13PASS: Got an exception. Error: NetworkError: DOM Exception 19
    1414Cross-origin XMLHttpRequest (sync), testing cookies.
    1515PASS

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt

    r178527 r195588  
    5959PASS xhr.send(null) is undefined.
    6060Should disallow origin: 'http://www2.localhost:8000'
    61 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     61PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    6262Should disallow origin: '//localhost:8000'
    63 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     63PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    6464Should disallow origin: '://localhost:8000'
    65 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     65PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    6666Should disallow origin: 'ftp://localhost:8000'
    67 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     67PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    6868Should disallow origin: 'http:://localhost:8000'
    69 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     69PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    7070Should disallow origin: 'http:/localhost:8000'
    71 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     71PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    7272Should disallow origin: 'http:localhost:8000'
    73 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     73PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    7474Should disallow origin: 'localhost:8000'
    75 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     75PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    7676Should disallow origin: 'http://localhost:8000?'
    77 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     77PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    7878Should disallow origin: 'http://localhost:8000/'
    79 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     79PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    8080Should disallow origin: 'http://localhost:8000 /'
    81 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     81PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    8282Should disallow origin: 'http://localhost:8000#'
    83 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     83PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    8484Should disallow origin: 'http://localhost:8000%23'
    85 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     85PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    8686Should disallow origin: 'http://localhost:8000:80'
    87 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     87PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    8888Should disallow origin: 'http://localhost:8000, *'
    89 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     89PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    9090Should disallow origin: 'HTTP://LOCALHOST:8000'
    91 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     91PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    9292Should disallow origin: 'HTTP://localhost:8000'
    93 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     93PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    9494Should disallow origin: '-'
    95 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     95PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    9696Should disallow origin: '**'
    97 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     97PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    9898Should disallow origin: '*'
    99 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     99PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    100100Should disallow origin: ''*''
    101 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     101PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    102102Should disallow origin: '"*"'
    103 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     103PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    104104Should disallow origin: '* *'
    105 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     105PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    106106Should disallow origin: '*http://*'
    107 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     107PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    108108Should disallow origin: '*http://localhost:8000'
    109 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     109PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    110110Should disallow origin: '* http://localhost:8000'
    111 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     111PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    112112Should disallow origin: '*, http://localhost:8000'
    113 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     113PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    114114Should disallow origin: 'http://localhost:8000'
    115 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     115PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    116116Should disallow origin: 'null http://localhost:8000'
    117 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     117PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    118118Should disallow origin: 'http://example.net'
    119 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     119PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    120120Should disallow origin: 'null'
    121 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     121PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    122122Should disallow origin: ''
    123 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     123PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    124124Should disallow origin: 'http://localhost:8000/xmlhttprequest/resources/origin-exact-matching-iframe.html'
    125 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     125PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    126126Should disallow origin: 'http://localhost:8000/xmlhttprequest/resources/'
    127 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     127PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    128128Should disallow origin: 'http://localhost:8000/xmlhttprequest/resources/origin-exact-matching-iframe.html'
    129 PASS xhr.send(null) threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101.
     129PASS xhr.send(null) threw exception Error: NetworkError: DOM Exception 19.
    130130PASS successfullyParsed is true
    131131

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt

    r178527 r195588  
    44
    55Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (sync)
    6 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     6PASS: Error: NetworkError: DOM Exception 19
    77Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (async)
    88PASS: 0

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt

    r178527 r195588  
    44
    55Testing: http://127.0.0.1:8000/xmlhttprequest/resources/get.txt (sync)
    6 FAIL: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     6FAIL: Error: NetworkError: DOM Exception 19
    77Testing: http://127.0.0.1:8000/xmlhttprequest/resources/get.txt (async)
    88FAIL: 0

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt

    r178527 r195588  
    1111Testing: source origin: http://127.0.0.1:8000 destination origin: http:localhost
    1212Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    13 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     13PASS: Error: NetworkError: DOM Exception 19
    1414Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
    1515PASS: PASS
    1616Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    17 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     17PASS: Error: NetworkError: DOM Exception 19
    1818
    1919
    2020Testing: source origin: http://127.0.0.1:8000 destination origin: http:localhost allowing subdomains
    2121Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    22 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     22PASS: Error: NetworkError: DOM Exception 19
    2323Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
    2424PASS: PASS
    2525Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    26 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     26PASS: Error: NetworkError: DOM Exception 19
    2727
    2828
    2929Testing: source origin: http://127.0.0.1:8000 destination origin: hTtP:LoCaLhOsT allowing subdomains
    3030Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    31 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     31PASS: Error: NetworkError: DOM Exception 19
    3232Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
    3333PASS: PASS
    3434Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    35 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     35PASS: Error: NetworkError: DOM Exception 19
    3636
    3737
    3838Testing: source origin: http://127.0.0.1:8000 destination origin: http: allowing subdomains
    3939Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    40 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     40PASS: Error: NetworkError: DOM Exception 19
    4141Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting PASS)
    4242PASS: PASS
    4343Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)
    44 PASS: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     44PASS: Error: NetworkError: DOM Exception 19
    4545
    4646

  • trunk/LayoutTests/http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt

    r104803 r195588  
    33
    44PASS: Cross-domain access allowed for simple get.
    5 PASS: Exception thrown. Cross-domain access was denied in 'send'. [NETWORK_ERR: XMLHttpRequest Exception 101].
     5PASS: Exception thrown. Cross-domain access was denied in 'send'. [NetworkError: DOM Exception 19].
    66DONE

  • trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt

    r178527 r195588  
    1414error
    1515loadend
    16 Error: NETWORK_ERR: XMLHttpRequest Exception 101
     16Error: NetworkError: DOM Exception 19
    1717
    1818Step 3: Cross origin request, allowed

  • trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt

    r195010 r195588  
    55readyState change 4
    66Error event.
    7 Exception: Error: NETWORK_ERR: XMLHttpRequest Exception 101
     7Exception: Error: NetworkError: DOM Exception 19
    88Async XHR started.
    99readyState change 1

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r195583 r195588  
     12016-01-26  Daniel Bates  <dabates@apple.com>
     2
     3        Remove XMLHttpRequestException
     4        https://bugs.webkit.org/show_bug.cgi?id=102698
     5        <rdar://problem/24338476>
     6
     7        Reviewed by Chris Dumez.
     8
     9        Update test result now that we throw DOMException.{ABORT, NETWORK, TIMEOUT}Error instead of XMLHttpRequestException.{ABORT, NETWORK, TIMEOUT}_ERR.
     10
     11        * web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt:
     12        * web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt:
     13        * web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync-expected.txt:
     14        * web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt:
     15        * web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt:
     16
    1172016-01-25  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    218

  • trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-network-error-sync-events.sub-expected.txt

    r191546 r195588  
    11CONSOLE MESSAGE: line 24: XMLHttpRequest cannot load http://nonexistent-origin.localhost}:8800. Cross origin requests are only supported for HTTP.
     2CONSOLE MESSAGE: line 32: XMLHttpRequest cannot load data:text/html;charset=utf-8;base64,PT0NUWVBFIGh0bWw%2BDQo8. Cross origin requests are only supported for HTTP.
    23
    3 FAIL XmlHttpRequest: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set) assert_throws: function "function ()
    4             {
    5                 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
     4PASS XmlHttpRequest: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set)
    65

  • trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt

    r191546 r195588  
    55Blocked access to external URL http://www2.localhost:8800/folder.txt
    66
    7 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
    8 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
    9 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
    10 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
    11 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
     7PASS XMLHttpRequest: send() - non same-origin (mailto:test@example.org)
     8PASS XMLHttpRequest: send() - non same-origin (tel:+31600000000)
     9FAIL 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
     10PASS XMLHttpRequest: send() - non same-origin (javascript:alert('FAIL'))
     11FAIL 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
    1212

  • trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-bogus-sync-expected.txt

    r191546 r195588  
    11
    2 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
    3 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
    4 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
    5 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
    6 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
     2PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (301: foobar://abcd)
     3PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (302: http://z)
     4PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (302: mailto:someone@example.org)
     5PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (303: http://z)
     6PASS XMLHttpRequest: send() - Redirects (bogus Location header; sync) (303: tel:1234567890)
    77

  • trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-infinite-sync-expected.txt

    r191546 r195588  
    11
    2 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
     2PASS XMLHttpRequest: send() - Redirects (infinite loop; sync) (301)
    33

  • trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-network-error-sync-expected.txt

    r191546 r195588  
    11
    2 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
     2PASS XMLHttpRequest: members during network errors (sync)
    33

  • trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt

    r195530 r195588  
    20792079PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
    20802080PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
    2081 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
    2082 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
    2083 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
    2084 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
    2085 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
    20862081PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
    20872082PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-lookup-precedence-expected.txt

    r194106 r195588  
    299299PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
    300300PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
    301 PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
    302 PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
    303301PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
    304302PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true

  • trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt

    r195530 r195588  
    20342034PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
    20352035PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
    2036 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
    2037 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
    2038 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
    2039 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
    2040 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
    20412036PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
    20422037PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt

    r195530 r195588  
    20742074PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
    20752075PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
    2076 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
    2077 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
    2078 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
    2079 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
    2080 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
    20812076PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
    20822077PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt

    r195530 r195588  
    20992099PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
    21002100PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
    2101 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
    2102 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
    2103 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
    2104 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
    2105 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
    21062101PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
    21072102PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt

    r195520 r195588  
    299299PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
    300300PASS win['XMLHttpRequest'] == '[object XMLHttpRequestConstructor]' is true
    301 PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
    302 PASS win['XMLHttpRequestException'] == '[object XMLHttpRequestExceptionConstructor]' is true
    303301PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true
    304302PASS win['XMLSerializer'] == '[object XMLSerializerConstructor]' is true

  • trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt

    r195530 r195588  
    21042104PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
    21052105PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
    2106 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
    2107 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
    2108 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
    2109 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
    2110 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
    21112106PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
    21122107PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/win/TestExpectations

    r195405 r195588  
    723723# This test is dependant on DRT being able to open windows.
    724724fast/dom/Window/new-window-opener.html
    725 
    726 # <rdar://5667279> Undefined value exception
    727 http/tests/xmlhttprequest/XMLHttpRequestException.html [ Skip ]
    728725
    729726# <rdar://5670235> Sometimes spews output into the next test

  • trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt

    r195530 r195588  
    18141814PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').enumerable is false
    18151815PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequest').configurable is true
    1816 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').value is XMLHttpRequestException
    1817 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('get') is false
    1818 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').hasOwnProperty('set') is false
    1819 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').enumerable is false
    1820 PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestException').configurable is true
    18211816PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').value is XMLHttpRequestProgressEvent
    18221817PASS Object.getOwnPropertyDescriptor(global, 'XMLHttpRequestProgressEvent').hasOwnProperty('get') is false

  • trunk/Source/WebCore/CMakeLists.txt

    r195582 r195588  
    639639    xml/DOMParser.idl
    640640    xml/XMLHttpRequest.idl
    641     xml/XMLHttpRequestException.idl
    642641    xml/XMLHttpRequestProgressEvent.idl
    643642    xml/XMLHttpRequestUpload.idl
    … …  
    28142813    xml/XMLErrors.cpp
    28152814    xml/XMLHttpRequest.cpp
    2816     xml/XMLHttpRequestException.cpp
    28172815    xml/XMLHttpRequestProgressEventThrottle.cpp
    28182816    xml/XMLHttpRequestUpload.cpp

  • trunk/Source/WebCore/ChangeLog

    r195584 r195588  
     12016-01-26  Daniel Bates  <dabates@apple.com>
     2
     3        Remove XMLHttpRequestException
     4        https://bugs.webkit.org/show_bug.cgi?id=102698
     5        <rdar://problem/24338476>
     6
     7        Reviewed by Chris Dumez.
     8
     9        Inspired by a patch by Erik Arvidsson.
     10
     11        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)
     12        XMLHttpRequest and WorkerGlobalScope.importScripts() should throw a DOMException object instead
     13        of a XMLHttpRequestException object when a NetworkError, AbortError, or TimeoutError occur. This
     14        makes the behavior of WebKit more closely conform to these standards as well as the behavior of
     15        other browsers.
     16
     17        * CMakeLists.txt: Remove entries for XMLHttpRequestException.idl and XMLHttpRequestException.cpp.
     18        * DerivedSources.make: Remove entry for XMLHttpRequestException.idl.
     19        * WebCore.order: Remove exported symbols for XMLHttpRequestException.
     20        * WebCore.vcxproj/WebCore.vcxproj: Remove entries for JSXMLHttpRequestException.{cpp, h}, XMLHttpRequestException.{cpp, h}
     21        * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
     22        * WebCore.xcodeproj/project.pbxproj: Ditto.
     23        * bindings/js/JSExceptionBase.cpp:
     24        (WebCore::toExceptionBase): Remove logic for XMLHttpRequestException.
     25        * dom/DOMExceptions.in: Remove entry for XMLHttpRequestException.
     26        * workers/WorkerGlobalScope.cpp:
     27        (WebCore::WorkerGlobalScope::importScripts): Throw DOMException.NETWORK_ERR instead of XMLHttpRequestException.NETWORK_ERR.
     28        * xml/XMLHttpRequest.cpp:
     29        (WebCore::XMLHttpRequest::createRequest): Ditto.
     30        (WebCore::XMLHttpRequest::didFail): Throw DOMException.ABORT_ERR instead of XMLHttpRequestException.ABORT_ERR.
     31        (WebCore::XMLHttpRequest::didReachTimeout): Throw DOMException.TIMEOUT_ERR instead of XMLHttpRequestException.TIMEOUT_ERR.
     32        * xml/XMLHttpRequestException.cpp: Removed.
     33        * xml/XMLHttpRequestException.h: Removed.
     34        * xml/XMLHttpRequestException.idl: Removed.
     35
    1362016-01-25  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    237

  • trunk/Source/WebCore/DerivedSources.make

    r195582 r195588  
    539539    $(WebCore)/xml/DOMParser.idl \
    540540    $(WebCore)/xml/XMLHttpRequest.idl \
    541     $(WebCore)/xml/XMLHttpRequestException.idl \
    542541    $(WebCore)/xml/XMLHttpRequestProgressEvent.idl \
    543542    $(WebCore)/xml/XMLHttpRequestUpload.idl \

  • trunk/Source/WebCore/WebCore.order

    r190794 r195588  
    61116111__ZN7WebCore12SQLException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
    61126112__ZN7WebCore12SVGException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
    6113 __ZN7WebCore23XMLHttpRequestException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
    61146113__ZN7WebCore14XPathException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
    61156114__ZN7WebCore16DOMCoreException21initializeDescriptionEiPNS_24ExceptionCodeDescriptionE
    … …  
    1105511054__ZN7WebCore16toRangeExceptionEN3JSC7JSValueE
    1105611055__ZN7WebCore16toEventExceptionEN3JSC7JSValueE
    11057 __ZN7WebCore25toXMLHttpRequestExceptionEN3JSC7JSValueE
    1105811056__ZN7WebCore14toSVGExceptionEN3JSC7JSValueE
    1105911057__ZN7WebCore16toXPathExceptionEN3JSC7JSValueE
    … …  
    1329013288__ZN7WebCore8Document17addConsoleMessageENS_13MessageSourceENS_12MessageLevelERKN3WTF6StringEm
    1329113289__ZN7WebCore14XMLHttpRequest12networkErrorEv
    13292 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_23XMLHttpRequestExceptionE
    13293 __ZN7WebCore15getDOMStructureINS_25JSXMLHttpRequestExceptionEEEPN3JSC9StructureEPNS2_9ExecStateEPNS_17JSDOMGlobalObjectE
    13294 __ZN7WebCore25JSXMLHttpRequestException15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
    13295 __ZN7WebCore12cacheWrapperINS_23XMLHttpRequestExceptionEEEvPNS_15DOMWrapperWorldEPT_PNS_12JSDOMWrapperE
    13296 __ZN7WebCore25JSXMLHttpRequestException18getOwnPropertySlotEPN3JSC6JSCellEPNS1_9ExecStateENS1_12PropertyNameERNS1_12PropertySlotE
    13297 __ZN3JSC18getStaticValueSlotIN7WebCore25JSXMLHttpRequestExceptionENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_NS_12PropertyNameERNS_12PropertySlotE
    13298 __ZN7WebCore34JSXMLHttpRequestExceptionPrototype18getOwnPropertySlotEPN3JSC6JSCellEPNS1_9ExecStateENS1_12PropertyNameERNS1_12PropertySlotE
    13299 __ZN3JSC21getStaticPropertySlotIN7WebCore34JSXMLHttpRequestExceptionPrototypeENS_8JSObjectEEEbPNS_9ExecStateEPKNS_9HashTableEPT_NS_12PropertyNameERNS_12PropertySlotE
    13300 __ZN7WebCore50jsXMLHttpRequestExceptionPrototypeFunctionToStringEPN3JSC9ExecStateE
    1330113290__ZNK7WebCore13ExceptionBase8toStringEv
    1330213291__ZN7WebCore14jsHistoryStateEPN3JSC9ExecStateENS0_7JSValueENS0_12PropertyNameE
    … …  
    2315023139__ZN7WebCoreL36JSXMLHttpRequestPrototypeTableValuesE
    2315123140__ZN7WebCoreL38JSXMLHttpRequestConstructorTableValuesE
    23152 __ZN7WebCore36JSXMLHttpRequestExceptionConstructor6s_infoE
    23153 __ZN7WebCore34JSXMLHttpRequestExceptionPrototype6s_infoE
    23154 __ZN7WebCore25JSXMLHttpRequestException6s_infoE
    23155 __ZTVN7WebCore30JSXMLHttpRequestExceptionOwnerE
    23156 __ZN7WebCoreL36JSXMLHttpRequestExceptionTableValuesE
    23157 __ZN7WebCoreL45JSXMLHttpRequestExceptionPrototypeTableValuesE
    23158 __ZN7WebCoreL47JSXMLHttpRequestExceptionConstructorTableValuesE
    2315923141__ZN7WebCore40JSXMLHttpRequestProgressEventConstructor6s_infoE
    2316023142__ZN7WebCore38JSXMLHttpRequestProgressEventPrototype6s_infoE
    … …  
    2594125923__ZN7WebCoreL30JSXMLHttpRequestPrototypeTableE
    2594225924__ZN7WebCoreL32JSXMLHttpRequestConstructorTableE
    25943 __ZN7WebCoreL30JSXMLHttpRequestExceptionTableE
    25944 __ZN7WebCoreL39JSXMLHttpRequestExceptionPrototypeTableE
    25945 __ZN7WebCoreL41JSXMLHttpRequestExceptionConstructorTableE
    25946 __ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_23XMLHttpRequestExceptionEE30jsXMLHttpRequestExceptionOwner
    25947 __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_23XMLHttpRequestExceptionEE30jsXMLHttpRequestExceptionOwner
    2594825925__ZN7WebCoreL34JSXMLHttpRequestProgressEventTableE
    2594925926__ZN7WebCoreL43JSXMLHttpRequestProgressEventPrototypeTableE

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r195520 r195588  
    65566556      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    65576557    </ClCompile>
    6558     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.cpp">
    6559       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    6560       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    6561       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    6562       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    6563       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    6564       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
    6565       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    6566       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    6567       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    6568       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
    6569       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    6570       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    6571     </ClCompile>
    65726558    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestProgressEvent.cpp">
    65736559      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    … …  
    1352813514    <ClCompile Include="..\xml\XMLErrors.cpp" />
    1352913515    <ClCompile Include="..\xml\XMLHttpRequest.cpp" />
    13530     <ClCompile Include="..\xml\XMLHttpRequestException.cpp" />
    1353113516    <ClCompile Include="..\xml\XMLHttpRequestProgressEventThrottle.cpp" />
    1353213517    <ClCompile Include="..\xml\XMLHttpRequestUpload.cpp" />
    … …  
    2025520240    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLDocument.h" />
    2025620241    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.h" />
    20257     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.h" />
    2025820242    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestProgressEvent.h" />
    2025920243    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestUpload.h" />
    … …  
    2198321967    <ClInclude Include="..\xml\XMLErrors.h" />
    2198421968    <ClInclude Include="..\xml\XMLHttpRequest.h" />
    21985     <ClInclude Include="..\xml\XMLHttpRequestException.h" />
    2198621969    <ClInclude Include="..\xml\XMLHttpRequestProgressEvent.h" />
    2198721970    <ClInclude Include="..\xml\XMLHttpRequestProgressEventThrottle.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r195520 r195588  
    29222922      <Filter>xml</Filter>
    29232923    </ClCompile>
    2924     <ClCompile Include="..\xml\XMLHttpRequestException.cpp">
    2925       <Filter>xml</Filter>
    2926     </ClCompile>
    29272924    <ClCompile Include="..\xml\XMLHttpRequestProgressEventThrottle.cpp">
    29282925      <Filter>xml</Filter>
    … …  
    62366233    </ClCompile>
    62376234    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.cpp">
    6238       <Filter>DerivedSources</Filter>
    6239     </ClCompile>
    6240     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.cpp">
    62416235      <Filter>DerivedSources</Filter>
    62426236    </ClCompile>
    … …  
    99779971      <Filter>xml</Filter>
    99789972    </ClInclude>
    9979     <ClInclude Include="..\xml\XMLHttpRequestException.h">
    9980       <Filter>xml</Filter>
    9981     </ClInclude>
    99829973    <ClInclude Include="..\xml\XMLHttpRequestProgressEvent.h">
    99839974      <Filter>xml</Filter>
    … …  
    1364913640    </ClInclude>
    1365013641    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequest.h">
    13651       <Filter>DerivedSources</Filter>
    13652     </ClInclude>
    13653     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSXMLHttpRequestException.h">
    1365413642      <Filter>DerivedSources</Filter>
    1365513643    </ClInclude>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r195564 r195588  
    38633863                978D07CA145A10160096908D /* SVGException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 978D07C9145A10160096908D /* SVGException.cpp */; };
    38643864                978D07CC145A102E0096908D /* XPathException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 978D07CB145A102E0096908D /* XPathException.cpp */; };
    3865                 978D07CE145A10370096908D /* XMLHttpRequestException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 978D07CD145A10370096908D /* XMLHttpRequestException.cpp */; };
    38663865                979F43D31075E44A0000F83B /* NavigationScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 979F43D11075E44A0000F83B /* NavigationScheduler.cpp */; };
    38673866                979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 979F43D21075E44A0000F83B /* NavigationScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    55485547                BC60D8F30D2A11E000B9918F /* ExceptionBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D8F10D2A11E000B9918F /* ExceptionBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
    55495548                BC60D90C0D2A17CE00B9918F /* EventException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D9090D2A17CE00B9918F /* EventException.h */; };
    5550                 BC60D9C90D2A29E500B9918F /* XMLHttpRequestException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D9C70D2A29E500B9918F /* XMLHttpRequestException.h */; };
    5551                 BC60DA390D2A302800B9918F /* JSXMLHttpRequestException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60DA370D2A302800B9918F /* JSXMLHttpRequestException.cpp */; };
    5552                 BC60DA3A0D2A302800B9918F /* JSXMLHttpRequestException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DA380D2A302800B9918F /* JSXMLHttpRequestException.h */; };
    55535549                BC60DA5B0D2A31F700B9918F /* XPathException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DA590D2A31F700B9918F /* XPathException.h */; };
    55545550                BC60DB490D2A3D1E00B9918F /* JSXPathException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60DB470D2A3D1E00B9918F /* JSXPathException.cpp */; };
    … …  
    1140911405                978D07C9145A10160096908D /* SVGException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGException.cpp; sourceTree = "<group>"; };
    1141011406                978D07CB145A102E0096908D /* XPathException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XPathException.cpp; sourceTree = "<group>"; };
    11411                 978D07CD145A10370096908D /* XMLHttpRequestException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLHttpRequestException.cpp; sourceTree = "<group>"; };
    1141211407                979F43D11075E44A0000F83B /* NavigationScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigationScheduler.cpp; sourceTree = "<group>"; };
    1141311408                979F43D21075E44A0000F83B /* NavigationScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationScheduler.h; sourceTree = "<group>"; };
    … …  
    1335813353                BC60D9090D2A17CE00B9918F /* EventException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventException.h; sourceTree = "<group>"; };
    1335913354                BC60D90A0D2A17CE00B9918F /* EventException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventException.idl; sourceTree = "<group>"; };
    13360                 BC60D9C70D2A29E500B9918F /* XMLHttpRequestException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestException.h; sourceTree = "<group>"; };
    13361                 BC60D9C80D2A29E500B9918F /* XMLHttpRequestException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XMLHttpRequestException.idl; sourceTree = "<group>"; };
    13362                 BC60DA370D2A302800B9918F /* JSXMLHttpRequestException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequestException.cpp; sourceTree = "<group>"; };
    13363                 BC60DA380D2A302800B9918F /* JSXMLHttpRequestException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXMLHttpRequestException.h; sourceTree = "<group>"; };
    1336413355                BC60DA590D2A31F700B9918F /* XPathException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPathException.h; sourceTree = "<group>"; };
    1336513356                BC60DA5A0D2A31F700B9918F /* XPathException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = XPathException.idl; sourceTree = "<group>"; };
    … …  
    2078920780                                BC348BD10DB7F804004ABAB9 /* JSXMLHttpRequest.cpp */,
    2079020781                                BC348BD20DB7F804004ABAB9 /* JSXMLHttpRequest.h */,
    20791                                 BC60DA370D2A302800B9918F /* JSXMLHttpRequestException.cpp */,
    20792                                 BC60DA380D2A302800B9918F /* JSXMLHttpRequestException.h */,
    2079320782                                F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */,
    2079420783                                F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */,
    … …  
    2310323092                                BC772C450C4EB2C60083285F /* XMLHttpRequest.h */,
    2310423093                                BC348BA70DB7F1B8004ABAB9 /* XMLHttpRequest.idl */,
    23105                                 978D07CD145A10370096908D /* XMLHttpRequestException.cpp */,
    23106                                 BC60D9C70D2A29E500B9918F /* XMLHttpRequestException.h */,
    23107                                 BC60D9C80D2A29E500B9918F /* XMLHttpRequestException.idl */,
    2310823094                                F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */,
    2310923095                                F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */,
    … …  
    2669826684                                7C4C96DD1AD4483500365A60 /* JSWritableStream.h in Headers */,
    2669926685                                BC348BD40DB7F804004ABAB9 /* JSXMLHttpRequest.h in Headers */,
    26700                                 BC60DA3A0D2A302800B9918F /* JSXMLHttpRequestException.h in Headers */,
    2670126686                                F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */,
    2670226687                                BCDFD4960E30592F009D10AD /* JSXMLHttpRequestUpload.h in Headers */,
    … …  
    2830128286                                59C28046138DC2410079B7E2 /* XMLErrors.h in Headers */,
    2830228287                                BC772C470C4EB2C60083285F /* XMLHttpRequest.h in Headers */,
    28303                                 BC60D9C90D2A29E500B9918F /* XMLHttpRequestException.h in Headers */,
    2830428288                                F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */,
    2830528289                                A136A00D1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h in Headers */,
    … …  
    3042930413                                BC348BD30DB7F804004ABAB9 /* JSXMLHttpRequest.cpp in Sources */,
    3043030414                                BC348BBE0DB7F531004ABAB9 /* JSXMLHttpRequestCustom.cpp in Sources */,
    30431                                 BC60DA390D2A302800B9918F /* JSXMLHttpRequestException.cpp in Sources */,
    3043230415                                F916C48D0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp in Sources */,
    3043330416                                BCDFD4950E30592F009D10AD /* JSXMLHttpRequestUpload.cpp in Sources */,
    … …  
    3170431687                                59C28045138DC2410079B7E2 /* XMLErrors.cpp in Sources */,
    3170531688                                BC772C460C4EB2C60083285F /* XMLHttpRequest.cpp in Sources */,
    31706                                 978D07CE145A10370096908D /* XMLHttpRequestException.cpp in Sources */,
    3170731689                                A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */,
    3170831690                                BCDFD48F0E305290009D10AD /* XMLHttpRequestUpload.cpp in Sources */,

  • trunk/Source/WebCore/bindings/js/JSExceptionBase.cpp

    r190281 r195588  
    3030#include "JSSQLException.h"
    3131#include "JSSVGException.h"
    32 #include "JSXMLHttpRequestException.h"
    3332#include "JSXPathException.h"
    3433#include "SQLException.h"
    … …  
    4039    if (DOMCoreException* domException = JSDOMCoreException::toWrapped(value))
    4140        return reinterpret_cast<ExceptionBase*>(domException);
    42     if (XMLHttpRequestException* xmlHttpException = JSXMLHttpRequestException::toWrapped(value))
    43         return reinterpret_cast<ExceptionBase*>(xmlHttpException);
    4441    if (SVGException* svgException = JSSVGException::toWrapped(value))
    4542        return reinterpret_cast<ExceptionBase*>(svgException);

  • trunk/Source/WebCore/dom/DOMExceptions.in

    r190281 r195588  
    55SQLException
    66SVGException
    7 XMLHttpRequestException
    87XPathException
    98

  • trunk/Source/WebCore/workers/WorkerGlobalScope.cpp

    r194496 r195588  
    5050#include "WorkerThread.h"
    5151#include "WorkerThreadableLoader.h"
    52 #include "XMLHttpRequestException.h"
    5352#include <bindings/ScriptValue.h>
    5453#include <inspector/ConsoleMessage.h>
    … …  
    189188        // If the fetching attempt failed, throw a NETWORK_ERR exception and abort all these steps.
    190189        if (scriptLoader->failed()) {
    191             ec = XMLHttpRequestException::NETWORK_ERR;
     190            ec = NETWORK_ERR;
    192191            return;
    193192        }

  • trunk/Source/WebCore/xml/XMLHttpRequest.cpp

    r195520 r195588  
    4949#include "TextResourceDecoder.h"
    5050#include "ThreadableLoader.h"
    51 #include "XMLHttpRequestException.h"
    5251#include "XMLHttpRequestProgressEvent.h"
    5352#include "XMLHttpRequestUpload.h"
    … …  
    713712    // Only GET request is supported for blob URL.
    714713    if (m_url.protocolIs("blob") && m_method != "GET") {
    715         ec = XMLHttpRequestException::NETWORK_ERR;
     714        ec = NETWORK_ERR;
    716715        return;
    717716    }
    … …  
    797796
    798797    if (!m_exceptionCode && m_error)
    799         m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;
     798        m_exceptionCode = NETWORK_ERR;
    800799    ec = m_exceptionCode;
    801800}
    … …  
    10671066
    10681067    if (error.isCancellation()) {
    1069         m_exceptionCode = XMLHttpRequestException::ABORT_ERR;
     1068        m_exceptionCode = ABORT_ERR;
    10701069        abortError();
    10711070        return;
    … …  
    10841083    }
    10851084
    1086     m_exceptionCode = XMLHttpRequestException::NETWORK_ERR;
     1085    m_exceptionCode = NETWORK_ERR;
    10871086    networkError();
    10881087}
    … …  
    12371236    m_sendFlag = false;
    12381237    m_error = true;
    1239     m_exceptionCode = XMLHttpRequestException::TIMEOUT_ERR;
     1238    m_exceptionCode = TIMEOUT_ERR;
    12401239
    12411240    if (!m_async) {
Note: See TracChangeset for help on using the changeset viewer.