Changeset 134345 in webkit


Ignore:
Timestamp:
Nov 12, 2012 8:03:41 PM (12 years ago)
Author:
arv@chromium.org
Message:

Replace DOMException TYPE_MISMATCH_ERR with TypeError
​https://bugs.webkit.org/show_bug.cgi?id=101604

Reviewed by Adam Barth.

Source/WebCore:

DOMException.TYPE_MISMATCH_ERR is deprecated in favor of using TypeError.

We have historically used TYPE_MISMATCH_ERR as a blanket DOMException code when
the spec mandates TypeError being thrown.

Updated existing tests.

  • Modules/mediastream/MediaConstraintsImpl.cpp:
  • Modules/mediastream/MediaStreamTrackList.cpp:
  • Modules/mediastream/PeerConnection00.cpp:
  • Modules/mediastream/RTCDataChannel.cpp:
  • Modules/mediastream/RTCIceCandidate.cpp:
  • Modules/mediastream/RTCPeerConnection.cpp:
  • Modules/mediastream/RTCSessionDescription.cpp:
  • Modules/mediastream/SessionDescription.cpp:
  • bindings/js/CallbackFunction.cpp:
  • bindings/js/JSCustomXPathNSResolver.cpp:
  • bindings/js/JSHTMLOptionsCollectionCustom.cpp:
  • bindings/js/JSHTMLSelectElementCustom.cpp:
  • bindings/js/JSMutationObserverCustom.cpp:
  • bindings/js/JSSQLResultSetRowListCustom.cpp:
  • bindings/js/JSSQLTransactionCustom.cpp:
  • bindings/js/JSSQLTransactionSyncCustom.cpp:
  • bindings/scripts/CodeGeneratorJS.pm:
  • bindings/scripts/CodeGeneratorObjC.pm:
  • bindings/scripts/CodeGeneratorV8.pm:
  • bindings/v8/V8Callback.h:
  • bindings/v8/V8Collection.cpp:
  • bindings/v8/custom/V8DocumentCustom.cpp:
  • bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp:
  • bindings/v8/custom/V8MutationObserverCustom.cpp:
  • bindings/v8/custom/V8SQLTransactionCustom.cpp:
  • bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:
  • dom/DOMCoreException.idl:
  • html/HTMLElement.cpp:
  • html/HTMLMediaElement.cpp:
  • html/HTMLOptionsCollection.cpp:
  • html/canvas/CanvasRenderingContext2D.cpp:
  • page/Crypto.cpp:
  • page/DOMSelection.cpp:
  • svg/properties/SVGTransformListPropertyTearOff.h:

LayoutTests:

Update the tests to test for TypeError instead of DOMException with the TYPE_MISMATCH_ERR code.

  • canvas/philip/tests/2d.drawImage.null.html:
  • canvas/philip/tests/2d.imageData.put.null.html:
  • canvas/philip/tests/2d.pattern.image.null.html:
  • editing/selection/extend-expected.txt:
  • fast/dom/Geolocation/argument-types-expected.txt:
  • fast/dom/Geolocation/not-enough-arguments-expected.txt:
  • fast/dom/Geolocation/script-tests/argument-types.js:
  • fast/dom/HTMLSelectElement/select-selectedIndex-expected.txt:
  • fast/dom/HTMLSelectElement/select-selectedIndex-multiple-expected.txt:
  • fast/js/select-options-add-expected.txt:
  • fast/mediastream/RTCIceCandidate-expected.txt:
  • fast/mediastream/RTCPeerConnection-expected.txt:
  • fast/mediastream/RTCSessionDescription-expected.txt:
  • fast/mediastream/SessionDescription-expected.txt:
  • fast/mediastream/peerconnection-addstream-expected.txt:
  • fast/mediastream/peerconnection-iceoptions-expected.txt:
  • fast/mediastream/peerconnection-iceoptions.html:
  • fast/mediastream/peerconnection-removestream-expected.txt:
  • media/encrypted-media/encrypted-media-syntax.html:
  • media/video-test.js:
  • platform/chromium/fast/dynamic/insertAdjacentElement-expected.txt:
  • security/crypto-random-values-types-expected.txt:
  • svg/dom/SVGTransformList-expected.txt:
Location:
trunk
Files:
53 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r134343 r134345  
     12012-11-12  Erik Arvidsson  <arv@chromium.org>
     2
     3        Replace DOMException TYPE_MISMATCH_ERR with TypeError
     4        https://bugs.webkit.org/show_bug.cgi?id=101604
     5
     6        Reviewed by Adam Barth.
     7
     8        Update the tests to test for TypeError instead of DOMException with the TYPE_MISMATCH_ERR code.
     9
     10        * canvas/philip/tests/2d.drawImage.null.html:
     11        * canvas/philip/tests/2d.imageData.put.null.html:
     12        * canvas/philip/tests/2d.pattern.image.null.html:
     13        * editing/selection/extend-expected.txt:
     14        * fast/dom/Geolocation/argument-types-expected.txt:
     15        * fast/dom/Geolocation/not-enough-arguments-expected.txt:
     16        * fast/dom/Geolocation/script-tests/argument-types.js:
     17        * fast/dom/HTMLSelectElement/select-selectedIndex-expected.txt:
     18        * fast/dom/HTMLSelectElement/select-selectedIndex-multiple-expected.txt:
     19        * fast/js/select-options-add-expected.txt:
     20        * fast/mediastream/RTCIceCandidate-expected.txt:
     21        * fast/mediastream/RTCPeerConnection-expected.txt:
     22        * fast/mediastream/RTCSessionDescription-expected.txt:
     23        * fast/mediastream/SessionDescription-expected.txt:
     24        * fast/mediastream/peerconnection-addstream-expected.txt:
     25        * fast/mediastream/peerconnection-iceoptions-expected.txt:
     26        * fast/mediastream/peerconnection-iceoptions.html:
     27        * fast/mediastream/peerconnection-removestream-expected.txt:
     28        * media/encrypted-media/encrypted-media-syntax.html:
     29        * media/video-test.js:
     30        * platform/chromium/fast/dynamic/insertAdjacentElement-expected.txt:
     31        * security/crypto-random-values-types-expected.txt:
     32        * svg/dom/SVGTransformList-expected.txt:
     33
    1342012-11-12  Joshua Bell  <jsbell@chromium.org>
    235

  • trunk/LayoutTests/canvas/philip/tests/2d.drawImage.null.html

    r71481 r134345  
    1515try { var _thrown = false;
    1616  ctx.drawImage(null, 0, 0);
    17 } catch (e) { if (e.code != DOMException.TYPE_MISMATCH_ERR) _fail("Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: "+e.message); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TYPE_MISMATCH_ERR: ctx.drawImage(null, 0, 0)"); }
     17} catch (e) { if (e.name != "TypeError") _fail("Failed assertion: expected exception of type TypeError, got: "+e.name); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TypeError: ctx.drawImage(null, 0, 0)"); }
    1818
    1919

  • trunk/LayoutTests/canvas/philip/tests/2d.imageData.put.null.html

    r71481 r134345  
    1515try { var _thrown = false;
    1616  ctx.putImageData(null, 0, 0);
    17 } catch (e) { if (e.code != DOMException.TYPE_MISMATCH_ERR) _fail("Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: "+e.message); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TYPE_MISMATCH_ERR: ctx.putImageData(null, 0, 0)"); }
     17} catch (e) { if (e.name != "TypeError") _fail("Failed assertion: expected exception of type TypeError, got: "+e.name); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TypeError: ctx.putImageData(null, 0, 0)"); }
    1818
    1919

  • trunk/LayoutTests/canvas/philip/tests/2d.pattern.image.null.html

    r71481 r134345  
    1515try { var _thrown = false;
    1616  ctx.createPattern(null, 'repeat');
    17 } catch (e) { if (e.code != DOMException.TYPE_MISMATCH_ERR) _fail("Failed assertion: expected exception of type TYPE_MISMATCH_ERR, got: "+e.message); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TYPE_MISMATCH_ERR: ctx.createPattern(null, 'repeat')"); }
     17} catch (e) { if (e.name != "TypeError") _fail("Failed assertion: expected exception of type TypeError, got: "+e.name); _thrown = true; } finally { _assert(_thrown, "should throw exception of type TypeError: ctx.createPattern(null, 'repeat')"); }
    1818
    1919

  • trunk/LayoutTests/editing/selection/extend-expected.txt

    r29963 r134345  
    55Success: window.getSelection() is b.
    66Success: window.getSelection() is arbaz.
    7 Success: s.extend() raised Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    8 Success: s.extend(null, 0) raised Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     7Success: s.extend() raised TypeError: Type error.
     8Success: s.extend(null, 0) raised TypeError: Type error.

  • trunk/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt

    r120792 r134345  
    44
    55
    6 PASS navigator.geolocation.getCurrentPosition() threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    7 PASS navigator.geolocation.getCurrentPosition(undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    8 PASS navigator.geolocation.getCurrentPosition(null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    9 PASS navigator.geolocation.getCurrentPosition({}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    10 PASS navigator.geolocation.getCurrentPosition(objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     6PASS navigator.geolocation.getCurrentPosition() threw exception TypeError: Type error.
     7PASS navigator.geolocation.getCurrentPosition(undefined) threw exception TypeError: Type error.
     8PASS navigator.geolocation.getCurrentPosition(null) threw exception TypeError: Type error.
     9PASS navigator.geolocation.getCurrentPosition({}) threw exception TypeError: Type error.
     10PASS navigator.geolocation.getCurrentPosition(objectThrowingException) threw exception TypeError: Type error.
    1111PASS navigator.geolocation.getCurrentPosition(emptyFunction) did not throw exception.
    1212PASS navigator.geolocation.getCurrentPosition(Math.abs) did not throw exception.
    1313PASS navigator.geolocation.getCurrentPosition(testRunner.setGeolocationPermission) did not throw exception.
    14 PASS navigator.geolocation.getCurrentPosition(true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    15 PASS navigator.geolocation.getCurrentPosition(42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    16 PASS navigator.geolocation.getCurrentPosition(Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    17 PASS navigator.geolocation.getCurrentPosition(-Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    18 PASS navigator.geolocation.getCurrentPosition("string") threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     14PASS navigator.geolocation.getCurrentPosition(true) threw exception TypeError: Type error.
     15PASS navigator.geolocation.getCurrentPosition(42) threw exception TypeError: Type error.
     16PASS navigator.geolocation.getCurrentPosition(Infinity) threw exception TypeError: Type error.
     17PASS navigator.geolocation.getCurrentPosition(-Infinity) threw exception TypeError: Type error.
     18PASS navigator.geolocation.getCurrentPosition("string") threw exception TypeError: Type error.
    1919PASS navigator.geolocation.getCurrentPosition(emptyFunction, undefined) did not throw exception.
    2020PASS navigator.geolocation.getCurrentPosition(emptyFunction, null) did not throw exception.
    21 PASS navigator.geolocation.getCurrentPosition(emptyFunction, {}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    22 PASS navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     21PASS navigator.geolocation.getCurrentPosition(emptyFunction, {}) threw exception TypeError: Type error.
     22PASS navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException) threw exception TypeError: Type error.
    2323PASS navigator.geolocation.getCurrentPosition(emptyFunction, emptyFunction) did not throw exception.
    2424PASS navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs) did not throw exception.
    2525PASS navigator.geolocation.getCurrentPosition(emptyFunction, testRunner.setGeolocationPermission) did not throw exception.
    26 PASS navigator.geolocation.getCurrentPosition(emptyFunction, true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    27 PASS navigator.geolocation.getCurrentPosition(emptyFunction, 42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    28 PASS navigator.geolocation.getCurrentPosition(emptyFunction, Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    29 PASS navigator.geolocation.getCurrentPosition(emptyFunction, -Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    30 PASS navigator.geolocation.getCurrentPosition(emptyFunction, "string") threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     26PASS navigator.geolocation.getCurrentPosition(emptyFunction, true) threw exception TypeError: Type error.
     27PASS navigator.geolocation.getCurrentPosition(emptyFunction, 42) threw exception TypeError: Type error.
     28PASS navigator.geolocation.getCurrentPosition(emptyFunction, Infinity) threw exception TypeError: Type error.
     29PASS navigator.geolocation.getCurrentPosition(emptyFunction, -Infinity) threw exception TypeError: Type error.
     30PASS navigator.geolocation.getCurrentPosition(emptyFunction, "string") threw exception TypeError: Type error.
    3131PASS navigator.geolocation.getCurrentPosition(emptyFunction, undefined, undefined) did not throw exception.
    3232PASS navigator.geolocation.getCurrentPosition(emptyFunction, undefined, null) did not throw exception.

  • trunk/LayoutTests/fast/dom/Geolocation/not-enough-arguments-expected.txt

    r92816 r134345  
    44
    55
    6 PASS window.navigator.geolocation.getCurrentPosition() threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    7 PASS window.navigator.geolocation.watchPosition() threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     6PASS window.navigator.geolocation.getCurrentPosition() threw exception TypeError: Type error.
     7PASS window.navigator.geolocation.watchPosition() threw exception TypeError: Type error.
    88PASS window.navigator.geolocation.clearWatch() threw exception TypeError: Not enough arguments.
    99PASS successfullyParsed is true

  • trunk/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js

    r120792 r134345  
    1414    if (expressionShouldThrow) {
    1515        if (expectedException)
    16             shouldThrow(expression, '(function() { return "' + expectedException + '"; })();');
     16            shouldThrow(expression, '"' + expectedException + '"');
    1717        else
    18             shouldThrow(expression, '(function() { return "Error: TYPE_MISMATCH_ERR: DOM Exception 17"; })();');
     18            shouldThrow(expression, '"TypeError: Type error"');
    1919    } else {
    2020        shouldNotThrow(expression);

  • trunk/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-expected.txt

    r110470 r134345  
    5858PASS mySelect.selectedIndex is -1
    595919) trying to set an element that's not an option: select element
    60 PASS mySelect.options[10] = mySelect; threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     60PASS mySelect.options[10] = mySelect; threw exception TypeError: Type error.
    6161PASS mySelect.options.length is 10
    6262PASS mySelect.selectedIndex is -1

  • trunk/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-multiple-expected.txt

    r110470 r134345  
    5858PASS mySelect.selectedIndex is 0
    595919) trying to set an element that's not an option: select element
    60 PASS mySelect.options[10] = mySelect; threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     60PASS mySelect.options[10] = mySelect; threw exception TypeError: Type error.
    6161PASS mySelect.options.length is 10
    6262PASS mySelect.selectedIndex is 0

  • trunk/LayoutTests/fast/js/select-options-add-expected.txt

    r28012 r134345  
    3030
    31311.4 Add a non-Option element
    32 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     32PASS select1.options.add(option1) threw exception TypeError: Type error.
    3333PASS select1.options.length is 3
    3434PASS select1.selectedIndex is 0
    3535
    36361.5 Add a non-element (string)
    37 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     37PASS select1.options.add(option1) threw exception TypeError: Type error.
    3838PASS select1.options.length is 3
    3939PASS select1.selectedIndex is 0
    4040
    41411.6 Add a non-element (number)
    42 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     42PASS select1.options.add(option1) threw exception TypeError: Type error.
    4343PASS select1.options.length is 3
    4444PASS select1.selectedIndex is 0
    4545
    46461.7 Add a non-element (boolean)
    47 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     47PASS select1.options.add(option1) threw exception TypeError: Type error.
    4848PASS select1.options.length is 3
    4949PASS select1.selectedIndex is 0
    5050
    51511.8 Add undefined
    52 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     52PASS select1.options.add(option1) threw exception TypeError: Type error.
    5353PASS select1.options.length is 3
    5454PASS select1.selectedIndex is 0
    5555
    56561.9 Add null
    57 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     57PASS select1.options.add(option1) threw exception TypeError: Type error.
    5858PASS select1.options.length is 3
    5959PASS select1.selectedIndex is 0
    6060
    61611.10 Add negative infinity
    62 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     62PASS select1.options.add(option1) threw exception TypeError: Type error.
    6363PASS select1.options.length is 3
    6464PASS select1.selectedIndex is 0
    6565
    66661.11 Add NaN
    67 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     67PASS select1.options.add(option1) threw exception TypeError: Type error.
    6868PASS select1.options.length is 3
    6969PASS select1.selectedIndex is 0
    7070
    71711.12 Add positive infinity
    72 PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     72PASS select1.options.add(option1) threw exception TypeError: Type error.
    7373PASS select1.options.length is 3
    7474PASS select1.selectedIndex is 0
    … …  
    164164
    1651652.9 Add an Option at index -Infinity
    166 PASS select2.options.add(option2, -1/0) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     166PASS select2.options.add(option2, -1/0) threw exception TypeError: Type error.
    167167PASS select2.options.length is 7
    168168PASS select2.selectedIndex is 1
    169169
    1701702.10 Add an Option at index NaN
    171 PASS select2.options.add(option2, 0/0) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     171PASS select2.options.add(option2, 0/0) threw exception TypeError: Type error.
    172172PASS select2.options.length is 7
    173173PASS select2.selectedIndex is 1
    174174
    1751752.11 Add an Option at index Infinity
    176 PASS select2.options.add(option2, 1/0) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     176PASS select2.options.add(option2, 1/0) threw exception TypeError: Type error.
    177177PASS select2.options.length is 7
    178178PASS select2.selectedIndex is 1
    179179
    1801802.12 Add a non-Option element
    181 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     181PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    182182PASS select2.options.length is 7
    183183PASS select2.selectedIndex is 1
    184184
    1851852.13 Add a non-element (string)
    186 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     186PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    187187PASS select2.options.length is 7
    188188PASS select2.selectedIndex is 1
    189189
    1901902.14 Add a non-element (number)
    191 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     191PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    192192PASS select2.options.length is 7
    193193PASS select2.selectedIndex is 1
    194194
    1951952.15 Add a non-element (boolean)
    196 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     196PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    197197PASS select2.options.length is 7
    198198PASS select2.selectedIndex is 1
    199199
    2002002.16 Add undefined
    201 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     201PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    202202PASS select2.options.length is 7
    203203PASS select2.selectedIndex is 1
    204204
    2052052.17 Add null
    206 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     206PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    207207PASS select2.options.length is 7
    208208PASS select2.selectedIndex is 1
    209209
    2102102.18 Add negative infinity
    211 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     211PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    212212PASS select2.options.length is 7
    213213PASS select2.selectedIndex is 1
    214214
    2152152.19 Add NaN
    216 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     216PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    217217PASS select2.options.length is 7
    218218PASS select2.selectedIndex is 1
    219219
    2202202.20 Add positive infinity
    221 PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     221PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
    222222PASS select2.options.length is 7
    223223PASS select2.selectedIndex is 1

  • trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt

    r126779 r134345  
    1313PASS candidate.sdpMid is "bar"
    1414PASS candidate.sdpMLineIndex is 6
    15 PASS new RTCIceCandidate({}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     15PASS new RTCIceCandidate({}); threw exception TypeError: Type error.
    1616PASS new RTCIceCandidate(5); threw exception TypeError: Not an object..
    1717PASS new RTCIceCandidate("foobar"); threw exception TypeError: Not an object..

  • trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt

    r134245 r134345  
    1515PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]}, null); did not throw exception.
    1616PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}, null); did not throw exception.
    17 PASS new webkitRTCPeerConnection({fooServers:[]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    18 PASS new webkitRTCPeerConnection({iceServers:true}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    19 PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    20 PASS new webkitRTCPeerConnection({iceServers:[{}]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    21 PASS new webkitRTCPeerConnection({iceServers:[{url:'foo'}]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     17PASS new webkitRTCPeerConnection({fooServers:[]}, null); threw exception TypeError: Type error.
     18PASS new webkitRTCPeerConnection({iceServers:true}, null); threw exception TypeError: Type error.
     19PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, null); threw exception TypeError: Type error.
     20PASS new webkitRTCPeerConnection({iceServers:[{}]}, null); threw exception TypeError: Type error.
     21PASS new webkitRTCPeerConnection({iceServers:[{url:'foo'}]}, null); threw exception TypeError: Type error.
    2222PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1}}); did not throw exception.
    2323PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}}); did not throw exception.
    … …  
    2929PASS new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1}}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
    3030PASS new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
    31 PASS new webkitRTCPeerConnection(null, {optional:{valid_and_supported_1:0}}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    32 PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     31PASS new webkitRTCPeerConnection(null, {optional:{valid_and_supported_1:0}}); threw exception TypeError: Type error.
     32PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception TypeError: Type error.
    3333PASS new webkitRTCPeerConnection(null, {optional:[{invalid:0}]}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
    34 PASS new webkitRTCPeerConnection(null, {valid_and_supported_1:1}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    35 PASS new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    36 PASS new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     34PASS new webkitRTCPeerConnection(null, {valid_and_supported_1:1}); threw exception TypeError: Type error.
     35PASS new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1}); threw exception TypeError: Type error.
     36PASS new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception TypeError: Type error.
    3737PASS successfullyParsed is true
    3838

  • trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt

    r126779 r134345  
    1111PASS sessionDescription.type is "offer"
    1212PASS sessionDescription.sdp is "foobar"
    13 PASS new RTCSessionDescription({}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     13PASS new RTCSessionDescription({}); threw exception TypeError: Type error.
    1414PASS new RTCSessionDescription(5); threw exception TypeError: Not an object..
    1515PASS new RTCSessionDescription('foobar'); threw exception TypeError: Not an object..
    16 PASS new RTCSessionDescription({type:'foobar', sdp:'x'}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    17 PASS new RTCSessionDescription({type:'offer', sdp:''}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     16PASS new RTCSessionDescription({type:'foobar', sdp:'x'}); threw exception TypeError: Type error.
     17PASS new RTCSessionDescription({type:'offer', sdp:''}); threw exception TypeError: Type error.
    1818PASS new RTCSessionDescription({type:'offer', sdp:'x'}); did not throw exception.
    1919PASS new RTCSessionDescription({type:'answer', sdp:'x'}); did not throw exception.

  • trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt

    r123409 r134345  
    2626
    27270-length key is caught before load state is checked.
    28 TEST(video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())) THROWS(DOMException.TYPE_MISMATCH_ERR) OK
     28TEST(video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())) THROWS('TypeError') OK
    2929
    3030Key system validity is not checked before loading.

  • trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax.html

    r123409 r134345  
    6262
    6363            consoleWrite("<br>0-length key is caught before load state is checked.");
    64             testException("video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())", "DOMException.TYPE_MISMATCH_ERR");
     64            testError("video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())", "'TypeError'");
    6565
    6666            consoleWrite("<br>Key system validity is not checked before loading.");

  • trunk/LayoutTests/media/video-test.js

    r130670 r134345  
    212212}
    213213
     214function testError(testString, errorName)
     215{
     216    try {
     217        eval(testString);
     218    } catch (ex) {
     219        logResult(ex.name == eval(errorName), "TEST(" + testString + ") THROWS("+errorName+")");
     220    }
     221}
     222
    214223var testEnded = false;
    215224

  • trunk/LayoutTests/platform/chromium/fast/dynamic/insertAdjacentElement-expected.txt

    r131694 r134345  
    11Caught expected exception: Error: NOT_SUPPORTED_ERR: DOM Exception 9
    2 Caught expected exception: Error: TYPE_MISMATCH_ERR: DOM Exception 17
     2Caught expected exception: TypeError: Type error
    331 (black) 2 (green) 3 (green) 4 (black)
    44

  • trunk/LayoutTests/security/crypto-random-values-types-expected.txt

    r78435 r134345  
    1212PASS crypto.getRandomValues(new Uint32Array(3)) is undefined.
    1313PASS crypto.getRandomValues(new Int32Array(3)) is undefined.
    14 PASS crypto.getRandomValues(new Float32Array(3)) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     14PASS crypto.getRandomValues(new Float32Array(3)) threw exception TypeError: Type error.
    1515PASS successfullyParsed is true
    1616

  • trunk/LayoutTests/svg/dom/SVGTransformList-expected.txt

    r89315 r134345  
    1212PASS transform.createSVGTransformFromMatrix(1) threw exception TypeError: Type error.
    1313PASS transform.createSVGTransformFromMatrix(true) threw exception TypeError: Type error.
    14 PASS transform.createSVGTransformFromMatrix(undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
    15 PASS transform.createSVGTransformFromMatrix(null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
     14PASS transform.createSVGTransformFromMatrix(undefined) threw exception TypeError: Type error.
     15PASS transform.createSVGTransformFromMatrix(null) threw exception TypeError: Type error.
    1616PASS successfullyParsed is true
    1717

  • trunk/Source/WebCore/ChangeLog

    r134342 r134345  
     12012-11-12  Erik Arvidsson  <arv@chromium.org>
     2
     3        Replace DOMException TYPE_MISMATCH_ERR with TypeError
     4        https://bugs.webkit.org/show_bug.cgi?id=101604
     5
     6        Reviewed by Adam Barth.
     7
     8        DOMException.TYPE_MISMATCH_ERR is deprecated in favor of using TypeError.
     9
     10        We have historically used TYPE_MISMATCH_ERR as a blanket DOMException code when
     11        the spec mandates TypeError being thrown.
     12
     13        Updated existing tests.
     14
     15        * Modules/mediastream/MediaConstraintsImpl.cpp:
     16        * Modules/mediastream/MediaStreamTrackList.cpp:
     17        * Modules/mediastream/PeerConnection00.cpp:
     18        * Modules/mediastream/RTCDataChannel.cpp:
     19        * Modules/mediastream/RTCIceCandidate.cpp:
     20        * Modules/mediastream/RTCPeerConnection.cpp:
     21        * Modules/mediastream/RTCSessionDescription.cpp:
     22        * Modules/mediastream/SessionDescription.cpp:
     23        * bindings/js/CallbackFunction.cpp:
     24        * bindings/js/JSCustomXPathNSResolver.cpp:
     25        * bindings/js/JSHTMLOptionsCollectionCustom.cpp:
     26        * bindings/js/JSHTMLSelectElementCustom.cpp:
     27        * bindings/js/JSMutationObserverCustom.cpp:
     28        * bindings/js/JSSQLResultSetRowListCustom.cpp:
     29        * bindings/js/JSSQLTransactionCustom.cpp:
     30        * bindings/js/JSSQLTransactionSyncCustom.cpp:
     31        * bindings/scripts/CodeGeneratorJS.pm:
     32        * bindings/scripts/CodeGeneratorObjC.pm:
     33        * bindings/scripts/CodeGeneratorV8.pm:
     34        * bindings/v8/V8Callback.h:
     35        * bindings/v8/V8Collection.cpp:
     36        * bindings/v8/custom/V8DocumentCustom.cpp:
     37        * bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp:
     38        * bindings/v8/custom/V8MutationObserverCustom.cpp:
     39        * bindings/v8/custom/V8SQLTransactionCustom.cpp:
     40        * bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:
     41        * dom/DOMCoreException.idl:
     42        * html/HTMLElement.cpp:
     43        * html/HTMLMediaElement.cpp:
     44        * html/HTMLOptionsCollection.cpp:
     45        * html/canvas/CanvasRenderingContext2D.cpp:
     46        * page/Crypto.cpp:
     47        * page/DOMSelection.cpp:
     48        * svg/properties/SVGTransformListPropertyTearOff.h:
     49
    1502012-11-12  Joshua Bell  <jsbell@chromium.org>
    251

  • trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp

    r134245 r134345  
    4646    RefPtr<MediaConstraintsImpl> object = adoptRef(new MediaConstraintsImpl());
    4747    if (!object->initialize(constraints)) {
    48         ec = TYPE_MISMATCH_ERR;
     48        ec = NATIVE_TYPE_ERR;
    4949        return 0;
    5050    }

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackList.cpp

    r127485 r134345  
    8181    RefPtr<MediaStreamTrack> track = prpTrack;
    8282    if (!track) {
    83         ec = TYPE_MISMATCH_ERR;
     83        ec = NATIVE_TYPE_ERR;
    8484        return;
    8585    }
    … …  
    106106    RefPtr<MediaStreamTrack> track = prpTrack;
    107107    if (!track) {
    108         ec = TYPE_MISMATCH_ERR;
     108        ec = NATIVE_TYPE_ERR;
    109109        return;
    110110    }

  • trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

    r134207 r134345  
    125125        m_binaryType = BinaryTypeArrayBuffer;
    126126    else
    127         ec = TYPE_MISMATCH_ERR;
     127        ec = NATIVE_TYPE_ERR;
    128128}
    129129

  • trunk/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp

    r126779 r134345  
    4747    bool ok = dictionary.get("candidate", candidate);
    4848    if (!ok || !candidate.length()) {
    49         ec = TYPE_MISMATCH_ERR;
     49        ec = NATIVE_TYPE_ERR;
    5050        return 0;
    5151    }

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

    r134093 r134345  
    7070    bool ok = configuration.get("iceServers", iceServers);
    7171    if (!ok || iceServers.isUndefinedOrNull()) {
    72         ec = TYPE_MISMATCH_ERR;
     72        ec = NATIVE_TYPE_ERR;
    7373        return 0;
    7474    }
    … …  
    7777    ok = iceServers.length(numberOfServers);
    7878    if (!ok) {
    79         ec = TYPE_MISMATCH_ERR;
     79        ec = NATIVE_TYPE_ERR;
    8080        return 0;
    8181    }
    … …  
    8787        ok = iceServers.get(i, iceServer);
    8888        if (!ok) {
    89             ec = TYPE_MISMATCH_ERR;
     89            ec = NATIVE_TYPE_ERR;
    9090            return 0;
    9191        }
    … …  
    9494        ok = iceServer.get("url", urlString);
    9595        if (!ok) {
    96             ec = TYPE_MISMATCH_ERR;
     96            ec = NATIVE_TYPE_ERR;
    9797            return 0;
    9898        }
    9999        KURL url(KURL(), urlString);
    100100        if (!url.isValid() || !(url.protocolIs("turn") || url.protocolIs("stun"))) {
    101             ec = TYPE_MISMATCH_ERR;
     101            ec = NATIVE_TYPE_ERR;
    102102            return 0;
    103103        }
    … …  
    171171
    172172    if (!successCallback) {
    173         ec = TYPE_MISMATCH_ERR;
     173        ec = NATIVE_TYPE_ERR;
    174174        return;
    175175    }
    … …  
    191191
    192192    if (!successCallback) {
    193         ec = TYPE_MISMATCH_ERR;
     193        ec = NATIVE_TYPE_ERR;
    194194        return;
    195195    }
    … …  
    212212    RefPtr<RTCSessionDescription> sessionDescription = prpSessionDescription;
    213213    if (!sessionDescription) {
    214         ec = TYPE_MISMATCH_ERR;
     214        ec = NATIVE_TYPE_ERR;
    215215        return;
    216216    }
    … …  
    244244    RefPtr<RTCSessionDescription> sessionDescription = prpSessionDescription;
    245245    if (!sessionDescription) {
    246         ec = TYPE_MISMATCH_ERR;
     246        ec = NATIVE_TYPE_ERR;
    247247        return;
    248248    }
    … …  
    295295
    296296    if (!iceCandidate) {
    297         ec = TYPE_MISMATCH_ERR;
     297        ec = NATIVE_TYPE_ERR;
    298298        return;
    299299    }
    … …  
    357357    RefPtr<MediaStream> stream = prpStream;
    358358    if (!stream) {
    359         ec =  TYPE_MISMATCH_ERR;
     359        ec =  NATIVE_TYPE_ERR;
    360360        return;
    361361    }
    … …  
    383383
    384384    if (!stream) {
    385         ec = TYPE_MISMATCH_ERR;
     385        ec = NATIVE_TYPE_ERR;
    386386        return;
    387387    }

  • trunk/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp

    r126779 r134345  
    5151    bool ok = dictionary.get("type", type);
    5252    if (!ok || !verifyType(type)) {
    53         ec = TYPE_MISMATCH_ERR;
     53        ec = NATIVE_TYPE_ERR;
    5454        return 0;
    5555    }
    … …  
    5858    ok = dictionary.get("sdp", sdp);
    5959    if (!ok || sdp.isEmpty()) {
    60         ec = TYPE_MISMATCH_ERR;
     60        ec = NATIVE_TYPE_ERR;
    6161        return 0;
    6262    }
    … …  
    9090        m_descriptor->setType(type);
    9191    else
    92         ec = TYPE_MISMATCH_ERR;
     92        ec = NATIVE_TYPE_ERR;
    9393}
    9494

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

    r95901 r134345  
    4242    JSC::CallData callData;
    4343    if (getCallData(value, callData) == JSC::CallTypeNone) {
    44         setDOMException(exec, TYPE_MISMATCH_ERR);
     44        setDOMException(exec, NATIVE_TYPE_ERR);
    4545        return false;
    4646    }

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

    r127191 r134345  
    4747    JSObject* resolverObject = value.getObject();
    4848    if (!resolverObject) {
    49         setDOMException(exec, TYPE_MISMATCH_ERR);
     49        setDOMException(exec, NATIVE_TYPE_ERR);
    5050        return 0;
    5151    }

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

    r134248 r134345  
    7575            return jsUndefined();
    7676        if (!ok)
    77             ec = TYPE_MISMATCH_ERR;
     77            ec = NATIVE_TYPE_ERR;
    7878        else
    7979            imp->add(option, index, ec);

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

    r97533 r134345  
    5454        HTMLOptionElement* option = toHTMLOptionElement(value);
    5555        if (!option)
    56             ec = TYPE_MISMATCH_ERR;
     56            ec = NATIVE_TYPE_ERR;
    5757        else
    5858            select->setOption(index, option, ec);

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

    r122159 r134345  
    5050    JSObject* object = exec->argument(0).getObject();
    5151    if (!object) {
    52         setDOMException(exec, TYPE_MISMATCH_ERR);
     52        setDOMException(exec, NATIVE_TYPE_ERR);
    5353        return JSValue::encode(jsUndefined());
    5454    }

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

    r127191 r134345  
    4646    int index = finiteInt32Value(exec->argument(0), exec, indexOk);
    4747    if (!indexOk) {
    48         setDOMException(exec, TYPE_MISMATCH_ERR);
     48        setDOMException(exec, NATIVE_TYPE_ERR);
    4949        return jsUndefined();
    5050    }

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

    r127191 r134345  
    6060        JSObject* object = exec->argument(1).getObject();
    6161        if (!object) {
    62             setDOMException(exec, TYPE_MISMATCH_ERR);
     62            setDOMException(exec, NATIVE_TYPE_ERR);
    6363            return jsUndefined();
    6464        }
    … …  
    9393        JSObject* object = exec->argument(2).getObject();
    9494        if (!object) {
    95             setDOMException(exec, TYPE_MISMATCH_ERR);
     95            setDOMException(exec, NATIVE_TYPE_ERR);
    9696            return jsUndefined();
    9797        }
    … …  
    104104        JSObject* object = exec->argument(3).getObject();
    105105        if (!object) {
    106             setDOMException(exec, TYPE_MISMATCH_ERR);
     106            setDOMException(exec, NATIVE_TYPE_ERR);
    107107            return jsUndefined();
    108108        }

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

    r127191 r134345  
    5959        JSObject* object = exec->argument(1).getObject();
    6060        if (!object) {
    61             setDOMException(exec, TYPE_MISMATCH_ERR);
     61            setDOMException(exec, NATIVE_TYPE_ERR);
    6262            return jsUndefined();
    6363        }

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r134221 r134345  
    27852785            if ($codeGenerator->IsSVGTypeNeedingTearOff($argType) and not $implClassName =~ /List$/) {
    27862786                push(@$outputArray, "    if (!$name) {\n");
    2787                 push(@$outputArray, "        setDOMException(exec, TYPE_MISMATCH_ERR);\n");
     2787                push(@$outputArray, "        setDOMException(exec, NATIVE_TYPE_ERR);\n");
    27882788                push(@$outputArray, "        return JSValue::encode(jsUndefined());\n");
    27892789                push(@$outputArray, "    }\n");

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

    r127032 r134345  
    15921592                push(@functionContent, "    $idlTypeWithNamespace* ${paramName}Core = $implGetter;\n");
    15931593                push(@functionContent, "    if (!${paramName}Core) {\n");
    1594                 push(@functionContent, "        WebCore::ExceptionCode ec = WebCore::TYPE_MISMATCH_ERR;\n");
     1594                push(@functionContent, "        WebCore::ExceptionCode ec = WebCore::NATIVE_TYPE_ERR;\n");
    15951595                push(@functionContent, "        $exceptionRaiseOnError\n");
    15961596                if ($returnType eq "void") {

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

    r134323 r134345  
    35923592            push @arguments, "$paramName->propertyReference()";
    35933593            $result .= $indent . "if (!$paramName)\n";
    3594             $result .= $indent . "    return setDOMException(WebCore::TYPE_MISMATCH_ERR, args.GetIsolate());\n";
     3594            $result .= $indent . "    return setDOMException(WebCore::NATIVE_TYPE_ERR, args.GetIsolate());\n";
    35953595        } elsif ($parameter->type eq "SVGMatrix" and $implClassName eq "SVGTransformList") {
    35963596            push @arguments, "$paramName.get()";

  • trunk/Source/WebCore/bindings/v8/V8Callback.h

    r129970 r134345  
    6464    if (!value->IsFunction()) {
    6565        succeeded = false;
    66         setDOMException(TYPE_MISMATCH_ERR, isolate);
     66        setDOMException(NATIVE_TYPE_ERR, isolate);
    6767        return 0;
    6868    }

  • trunk/Source/WebCore/bindings/v8/V8Collection.cpp

    r125495 r134345  
    4747    ExceptionCode ec = 0;
    4848
    49     // Check that the value is an HTMLOptionElement.  If not, throw a TYPE_MISMATCH_ERR DOMException.
     49    // Check that the value is an HTMLOptionElement. If not, throw a TypeError.
    5050    if (!V8HTMLOptionElement::HasInstance(value)) {
    51         setDOMException(TYPE_MISMATCH_ERR, isolate);
     51        setDOMException(NATIVE_TYPE_ERR, isolate);
    5252        return value;
    5353    }

  • trunk/Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp

    r134089 r134345  
    7878    RefPtr<XPathNSResolver> resolver = toXPathNSResolver(args[2]);
    7979    if (!resolver && !args[2]->IsNull() && !args[2]->IsUndefined())
    80         return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
     80        return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
    8181
    8282    int type = toInt32(args[3]);

  • trunk/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp

    r134248 r134345  
    5656    INC_STATS("DOM.HTMLOptionsCollection.add()");
    5757    if (!V8HTMLOptionElement::HasInstance(args[0]))
    58         return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
     58        return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
    5959    HTMLOptionsCollection* imp = V8HTMLOptionsCollection::toNative(args.Holder());
    6060    HTMLOptionElement* option = V8HTMLOptionElement::toNative(v8::Handle<v8::Object>(v8::Handle<v8::Object>::Cast(args[0])));
    … …  
    7272
    7373        if (!ok)
    74             ec = TYPE_MISMATCH_ERR;
     74            ec = NATIVE_TYPE_ERR;
    7575        else
    7676            imp->add(option, index, ec);

  • trunk/Source/WebCore/bindings/v8/custom/V8MutationObserverCustom.cpp

    r128139 r134345  
    5959    v8::Local<v8::Value> arg = args[0];
    6060    if (!arg->IsObject())
    61         return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
     61        return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
    6262
    6363    ScriptExecutionContext* context = getScriptExecutionContext();

  • trunk/Source/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp

    r128139 r134345  
    6060    if (args.Length() > 1 && !isUndefinedOrNull(args[1])) {
    6161        if (!args[1]->IsObject())
    62             return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
     62            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
    6363
    6464        uint32_t sqlArgsLength = 0;
    … …  
    9494    if (args.Length() > 2 && !isUndefinedOrNull(args[2])) {
    9595        if (!args[2]->IsObject())
    96             return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
     96            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
    9797        callback = V8SQLStatementCallback::create(args[2], scriptExecutionContext);
    9898    }
    … …  
    101101    if (args.Length() > 3 && !isUndefinedOrNull(args[3])) {
    102102        if (!args[3]->IsObject())
    103             return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
     103            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
    104104        errorCallback = V8SQLStatementErrorCallback::create(args[3], scriptExecutionContext);
    105105    }

  • trunk/Source/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp

    r127946 r134345  
    6060    if (args.Length() > 1 && !isUndefinedOrNull(args[1])) {
    6161        if (!args[1]->IsObject())
    62             return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
     62            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
    6363
    6464        uint32_t sqlArgsLength = 0;

  • trunk/Source/WebCore/dom/DOMCoreException.idl

    r131172 r134345  
    6666    const unsigned short      VALIDATION_ERR                 = 16;
    6767    // Introduced in DOM Level 3:
     68    // Deprecated in DOM Living Standard
    6869    const unsigned short      TYPE_MISMATCH_ERR              = 17;
    6970    // Introduced as an XHR extension:

  • trunk/Source/WebCore/html/HTMLElement.cpp

    r134322 r134345  
    547547{
    548548    if (!newChild) {
    549         // IE throws COM Exception E_INVALIDARG; this is the best DOM exception alternative.
    550         ec = TYPE_MISMATCH_ERR;
     549        // IE throws an Error with the message "Invalid argument.".
     550        ec = NATIVE_TYPE_ERR;
    551551        return 0;
    552552    }

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r133806 r134345  
    24672467
    24682468    if (!key->length()) {
    2469         ec = TYPE_MISMATCH_ERR;
     2469        ec = NATIVE_TYPE_ERR;
    24702470        return;
    24712471    }

  • trunk/Source/WebCore/html/HTMLOptionsCollection.cpp

    r123281 r134345  
    4949
    5050    if (!newOption) {
    51         ec = TYPE_MISMATCH_ERR;
     51        ec = NATIVE_TYPE_ERR;
    5252        return;
    5353    }

  • trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

    r128116 r134345  
    13071307{
    13081308    if (!image) {
    1309         ec = TYPE_MISMATCH_ERR;
     1309        ec = NATIVE_TYPE_ERR;
    13101310        return;
    13111311    }
    … …  
    13181318{
    13191319    if (!image) {
    1320         ec = TYPE_MISMATCH_ERR;
     1320        ec = NATIVE_TYPE_ERR;
    13211321        return;
    13221322    }
    … …  
    13401340{
    13411341    if (!image) {
    1342         ec = TYPE_MISMATCH_ERR;
     1342        ec = NATIVE_TYPE_ERR;
    13431343        return;
    13441344    }
    … …  
    14171417{
    14181418    if (!sourceCanvas) {
    1419         ec = TYPE_MISMATCH_ERR;
     1419        ec = NATIVE_TYPE_ERR;
    14201420        return;
    14211421    }
    … …  
    14821482{
    14831483    if (!video) {
    1484         ec = TYPE_MISMATCH_ERR;
     1484        ec = NATIVE_TYPE_ERR;
    14851485        return;
    14861486    }
    … …  
    14931493{
    14941494    if (!video) {
    1495         ec = TYPE_MISMATCH_ERR;
     1495        ec = NATIVE_TYPE_ERR;
    14961496        return;
    14971497    }
    … …  
    15111511{
    15121512    if (!video) {
    1513         ec = TYPE_MISMATCH_ERR;
     1513        ec = NATIVE_TYPE_ERR;
    15141514        return;
    15151515    }
    … …  
    17551755{
    17561756    if (!image) {
    1757         ec = TYPE_MISMATCH_ERR;
     1757        ec = NATIVE_TYPE_ERR;
    17581758        return 0;
    17591759    }
    … …  
    17791779{
    17801780    if (!canvas) {
    1781         ec = TYPE_MISMATCH_ERR;
     1781        ec = NATIVE_TYPE_ERR;
    17821782        return 0;
    17831783    }
    … …  
    19561956{
    19571957    if (!data) {
    1958         ec = TYPE_MISMATCH_ERR;
     1958        ec = NATIVE_TYPE_ERR;
    19591959        return;
    19601960    }
    … …  
    19651965{
    19661966    if (!data) {
    1967         ec = TYPE_MISMATCH_ERR;
     1967        ec = NATIVE_TYPE_ERR;
    19681968        return;
    19691969    }
    … …  
    19861986{
    19871987    if (!data) {
    1988         ec = TYPE_MISMATCH_ERR;
     1988        ec = NATIVE_TYPE_ERR;
    19891989        return;
    19901990    }

  • trunk/Source/WebCore/page/Crypto.cpp

    r126953 r134345  
    6161#if USE(OS_RANDOMNESS)
    6262    if (!array || !isIntegerArray(array)) {
    63         ec = TYPE_MISMATCH_ERR;
     63        ec = NATIVE_TYPE_ERR;
    6464        return;
    6565    }

  • trunk/Source/WebCore/page/DOMSelection.cpp

    r130124 r134345  
    337337
    338338    if (!node) {
    339         ec = TYPE_MISMATCH_ERR;
     339        ec = NATIVE_TYPE_ERR;
    340340        return;
    341341    }

  • trunk/Source/WebCore/svg/properties/SVGTransformListPropertyTearOff.h

    r110835 r134345  
    4343        ASSERT(m_values);
    4444        if (!matrix) {
    45             ec = TYPE_MISMATCH_ERR;
     45            ec = NATIVE_TYPE_ERR;
    4646            return 0;
    4747        }
Note: See TracChangeset for help on using the changeset viewer.