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:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index eb6ec7f..40d5b7f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,36 @@
+2012-11-12  Erik Arvidsson  <arv@chromium.org>
+
+        Replace DOMException TYPE_MISMATCH_ERR with TypeError
+        https://bugs.webkit.org/show_bug.cgi?id=101604
+
+        Reviewed by Adam Barth.
+
+        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:
+
 2012-11-12  Joshua Bell  <jsbell@chromium.org>
 
         IndexedDB: storage/indexeddb/cursor-prev-no-duplicate.html is flaky

diff --git a/LayoutTests/canvas/philip/tests/2d.drawImage.null.html b/LayoutTests/canvas/philip/tests/2d.drawImage.null.html
index 9680227..8a6c9e0 100644 (file)
--- a/LayoutTests/canvas/philip/tests/2d.drawImage.null.html
+++ b/LayoutTests/canvas/philip/tests/2d.drawImage.null.html
@@ -14,7 +14,7 @@ _addTest(function(canvas, ctx) {
 
 try { var _thrown = false;
   ctx.drawImage(null, 0, 0);
-} 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)"); }
+} 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)"); }
 
 
 });

diff --git a/LayoutTests/canvas/philip/tests/2d.imageData.put.null.html b/LayoutTests/canvas/philip/tests/2d.imageData.put.null.html
index 85f23a6..42f0905 100644 (file)
--- a/LayoutTests/canvas/philip/tests/2d.imageData.put.null.html
+++ b/LayoutTests/canvas/philip/tests/2d.imageData.put.null.html
@@ -14,7 +14,7 @@ _addTest(function(canvas, ctx) {
 
 try { var _thrown = false;
   ctx.putImageData(null, 0, 0);
-} 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)"); }
+} 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)"); }
 
 
 });

diff --git a/LayoutTests/canvas/philip/tests/2d.pattern.image.null.html b/LayoutTests/canvas/philip/tests/2d.pattern.image.null.html
index af4eed7..260d36f 100644 (file)
--- a/LayoutTests/canvas/philip/tests/2d.pattern.image.null.html
+++ b/LayoutTests/canvas/philip/tests/2d.pattern.image.null.html
@@ -14,7 +14,7 @@ _addTest(function(canvas, ctx) {
 
 try { var _thrown = false;
   ctx.createPattern(null, 'repeat');
-} 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')"); }
+} 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')"); }
 
 
 });

diff --git a/LayoutTests/editing/selection/extend-expected.txt b/LayoutTests/editing/selection/extend-expected.txt
index 0a45cfe..8e72277 100644 (file)
--- a/LayoutTests/editing/selection/extend-expected.txt
+++ b/LayoutTests/editing/selection/extend-expected.txt
@@ -4,5 +4,5 @@ Success: s.extend(span2.firstChild, 4) raised Error: INDEX_SIZE_ERR: DOM Excepti
 Success: s.extend(span2.firstChild, -1) raised Error: INDEX_SIZE_ERR: DOM Exception 1.
 Success: window.getSelection() is b.
 Success: window.getSelection() is arbaz.
-Success: s.extend() raised Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-Success: s.extend(null, 0) raised Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+Success: s.extend() raised TypeError: Type error.
+Success: s.extend(null, 0) raised TypeError: Type error.

diff --git a/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt b/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt
index 259e1f8..3cdd84a 100644 (file)
--- a/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/argument-types-expected.txt
@@ -3,31 +3,31 @@ Tests the acceptable types for arguments to Geolocation methods.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS navigator.geolocation.getCurrentPosition() threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition({}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS navigator.geolocation.getCurrentPosition() threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(undefined) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(null) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition({}) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(objectThrowingException) threw exception TypeError: Type error.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction) did not throw exception.
 PASS navigator.geolocation.getCurrentPosition(Math.abs) did not throw exception.
 PASS navigator.geolocation.getCurrentPosition(testRunner.setGeolocationPermission) did not throw exception.
-PASS navigator.geolocation.getCurrentPosition(true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(-Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition("string") threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS navigator.geolocation.getCurrentPosition(true) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(42) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(Infinity) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(-Infinity) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition("string") threw exception TypeError: Type error.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, undefined) did not throw exception.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, null) did not throw exception.
-PASS navigator.geolocation.getCurrentPosition(emptyFunction, {}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, {}) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, objectThrowingException) threw exception TypeError: Type error.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, emptyFunction) did not throw exception.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, Math.abs) did not throw exception.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, testRunner.setGeolocationPermission) did not throw exception.
-PASS navigator.geolocation.getCurrentPosition(emptyFunction, true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(emptyFunction, 42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(emptyFunction, Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(emptyFunction, -Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.geolocation.getCurrentPosition(emptyFunction, "string") threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, true) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, 42) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, Infinity) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, -Infinity) threw exception TypeError: Type error.
+PASS navigator.geolocation.getCurrentPosition(emptyFunction, "string") threw exception TypeError: Type error.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, undefined, undefined) did not throw exception.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, undefined, null) did not throw exception.
 PASS navigator.geolocation.getCurrentPosition(emptyFunction, undefined, {}) did not throw exception.

diff --git a/LayoutTests/fast/dom/Geolocation/not-enough-arguments-expected.txt b/LayoutTests/fast/dom/Geolocation/not-enough-arguments-expected.txt
index 1bd230f..d0b5c68 100644 (file)
--- a/LayoutTests/fast/dom/Geolocation/not-enough-arguments-expected.txt
+++ b/LayoutTests/fast/dom/Geolocation/not-enough-arguments-expected.txt
@@ -3,8 +3,8 @@ Tests how Geolocation handles receiving too few arguments.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS window.navigator.geolocation.getCurrentPosition() threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS window.navigator.geolocation.watchPosition() threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS window.navigator.geolocation.getCurrentPosition() threw exception TypeError: Type error.
+PASS window.navigator.geolocation.watchPosition() threw exception TypeError: Type error.
 PASS window.navigator.geolocation.clearWatch() threw exception TypeError: Not enough arguments.
 PASS successfullyParsed is true
 

diff --git a/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js b/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js
index 6161c84..6e9dea6 100644 (file)
--- a/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js
+++ b/LayoutTests/fast/dom/Geolocation/script-tests/argument-types.js
@@ -13,9 +13,9 @@ function shouldNotThrow(expression)
 function test(expression, expressionShouldThrow, expectedException) {
     if (expressionShouldThrow) {
         if (expectedException)
-            shouldThrow(expression, '(function() { return "' + expectedException + '"; })();');
+            shouldThrow(expression, '"' + expectedException + '"');
         else
-            shouldThrow(expression, '(function() { return "Error: TYPE_MISMATCH_ERR: DOM Exception 17"; })();');
+            shouldThrow(expression, '"TypeError: Type error"');
     } else {
         shouldNotThrow(expression);
     }

diff --git a/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-expected.txt b/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-expected.txt
index b2f37d7..52bccf6 100644 (file)
--- a/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-expected.txt
+++ b/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-expected.txt
@@ -57,7 +57,7 @@ PASS mySelect.selectedIndex is -1
 PASS mySelect.options.length is 10
 PASS mySelect.selectedIndex is -1
 19) trying to set an element that's not an option: select element
-PASS mySelect.options[10] = mySelect; threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS mySelect.options[10] = mySelect; threw exception TypeError: Type error.
 PASS mySelect.options.length is 10
 PASS mySelect.selectedIndex is -1
 20) trying to set a option element using an invalid index: negative infinity

diff --git a/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-multiple-expected.txt b/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-multiple-expected.txt
index ba98f3d..f86a6dd 100644 (file)
--- a/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-multiple-expected.txt
+++ b/LayoutTests/fast/dom/HTMLSelectElement/select-selectedIndex-multiple-expected.txt
@@ -57,7 +57,7 @@ PASS mySelect.selectedIndex is 0
 PASS mySelect.options.length is 10
 PASS mySelect.selectedIndex is 0
 19) trying to set an element that's not an option: select element
-PASS mySelect.options[10] = mySelect; threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS mySelect.options[10] = mySelect; threw exception TypeError: Type error.
 PASS mySelect.options.length is 10
 PASS mySelect.selectedIndex is 0
 20) trying to set a option element using an invalid index: negative infinity

diff --git a/LayoutTests/fast/js/select-options-add-expected.txt b/LayoutTests/fast/js/select-options-add-expected.txt
index afc6d13..585b5d2 100644 (file)
--- a/LayoutTests/fast/js/select-options-add-expected.txt
+++ b/LayoutTests/fast/js/select-options-add-expected.txt
@@ -29,47 +29,47 @@ PASS select1.options[2].value is '3'
 PASS select1.options[2].textContent is 'C'
 
 1.4 Add a non-Option element
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.5 Add a non-element (string)
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.6 Add a non-element (number)
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.7 Add a non-element (boolean)
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.8 Add undefined
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.9 Add null
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.10 Add negative infinity
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.11 Add NaN
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
 1.12 Add positive infinity
-PASS select1.options.add(option1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select1.options.add(option1) threw exception TypeError: Type error.
 PASS select1.options.length is 3
 PASS select1.selectedIndex is 0
 
@@ -163,62 +163,62 @@ PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.9 Add an Option at index -Infinity
-PASS select2.options.add(option2, -1/0) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, -1/0) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.10 Add an Option at index NaN
-PASS select2.options.add(option2, 0/0) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 0/0) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.11 Add an Option at index Infinity
-PASS select2.options.add(option2, 1/0) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1/0) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.12 Add a non-Option element
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.13 Add a non-element (string)
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.14 Add a non-element (number)
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.15 Add a non-element (boolean)
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.16 Add undefined
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.17 Add null
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.18 Add negative infinity
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.19 Add NaN
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 
 2.20 Add positive infinity
-PASS select2.options.add(option2, 1) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS select2.options.add(option2, 1) threw exception TypeError: Type error.
 PASS select2.options.length is 7
 PASS select2.selectedIndex is 1
 

diff --git a/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt b/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt
index 6216e8e..e90f04c 100644 (file)
--- a/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt
+++ b/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt
@@ -12,7 +12,7 @@ PASS candidate = new RTCIceCandidate(initializer); did not throw exception.
 PASS candidate.candidate is "foo"
 PASS candidate.sdpMid is "bar"
 PASS candidate.sdpMLineIndex is 6
-PASS new RTCIceCandidate({}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new RTCIceCandidate({}); threw exception TypeError: Type error.
 PASS new RTCIceCandidate(5); threw exception TypeError: Not an object..
 PASS new RTCIceCandidate("foobar"); threw exception TypeError: Not an object..
 PASS new RTCIceCandidate(candidate:""); threw exception SyntaxError: Unexpected token :.

diff --git a/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt b/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt
index c7a381f..e3fd22b 100644 (file)
--- a/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt
+++ b/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt
@@ -14,11 +14,11 @@ PASS new webkitRTCPeerConnection({iceServers:[]}, null); did not throw exception
 PASS new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}, null); did not throw exception.
 PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]}, null); did not throw exception.
 PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}, null); did not throw exception.
-PASS new webkitRTCPeerConnection({fooServers:[]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new webkitRTCPeerConnection({iceServers:true}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new webkitRTCPeerConnection({iceServers:[{}]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new webkitRTCPeerConnection({iceServers:[{url:'foo'}]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new webkitRTCPeerConnection({fooServers:[]}, null); threw exception TypeError: Type error.
+PASS new webkitRTCPeerConnection({iceServers:true}, null); threw exception TypeError: Type error.
+PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, null); threw exception TypeError: Type error.
+PASS new webkitRTCPeerConnection({iceServers:[{}]}, null); threw exception TypeError: Type error.
+PASS new webkitRTCPeerConnection({iceServers:[{url:'foo'}]}, null); threw exception TypeError: Type error.
 PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1}}); did not throw exception.
 PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:1, valid_and_supported_2:1}}); did not throw exception.
 PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0}]}); did not throw exception.
@@ -28,12 +28,12 @@ PASS new webkitRTCPeerConnection(null, {mandatory:{valid_and_supported_1:66}});
 PASS new webkitRTCPeerConnection(null, {mandatory:{invalid:1}}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
 PASS new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1}}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
 PASS new webkitRTCPeerConnection(null, {mandatory:{valid_but_unsupported_1:1, valid_and_supported_1:1}}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
-PASS new webkitRTCPeerConnection(null, {optional:{valid_and_supported_1:0}}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new webkitRTCPeerConnection(null, {optional:{valid_and_supported_1:0}}); threw exception TypeError: Type error.
+PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception TypeError: Type error.
 PASS new webkitRTCPeerConnection(null, {optional:[{invalid:0}]}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
-PASS new webkitRTCPeerConnection(null, {valid_and_supported_1:1}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new webkitRTCPeerConnection(null, {valid_and_supported_1:1}); threw exception TypeError: Type error.
+PASS new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1}); threw exception TypeError: Type error.
+PASS new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception TypeError: Type error.
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt b/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt
index 6981f07..bab4211 100644 (file)
--- a/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt
+++ b/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt
@@ -10,11 +10,11 @@ PASS initializer = JSON.parse(JSON.stringify(sessionDescription)); did not throw
 PASS sessionDescription = new RTCSessionDescription(initializer); did not throw exception.
 PASS sessionDescription.type is "offer"
 PASS sessionDescription.sdp is "foobar"
-PASS new RTCSessionDescription({}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new RTCSessionDescription({}); threw exception TypeError: Type error.
 PASS new RTCSessionDescription(5); threw exception TypeError: Not an object..
 PASS new RTCSessionDescription('foobar'); threw exception TypeError: Not an object..
-PASS new RTCSessionDescription({type:'foobar', sdp:'x'}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS new RTCSessionDescription({type:'offer', sdp:''}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new RTCSessionDescription({type:'foobar', sdp:'x'}); threw exception TypeError: Type error.
+PASS new RTCSessionDescription({type:'offer', sdp:''}); threw exception TypeError: Type error.
 PASS new RTCSessionDescription({type:'offer', sdp:'x'}); did not throw exception.
 PASS new RTCSessionDescription({type:'answer', sdp:'x'}); did not throw exception.
 PASS new RTCSessionDescription({type:'pranswer', sdp:'x'}); did not throw exception.

diff --git a/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt b/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt
index fb24787..35fd7f8 100644 (file)
--- a/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt
+++ b/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt
@@ -25,7 +25,7 @@ TEST(video.webkitAddKey('webkit-org.w3.clearkey', null)) THROWS(DOMException.SYN
 TEST(video.webkitAddKey('webkit-org.w3.clearkey', undefined)) THROWS(DOMException.SYNTAX_ERR) OK
 
 0-length key is caught before load state is checked.
-TEST(video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())) THROWS(DOMException.TYPE_MISMATCH_ERR) OK
+TEST(video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())) THROWS('TypeError') OK
 
 Key system validity is not checked before loading.
 TEST(video.webkitGenerateKeyRequest('com.example.invalid')) THROWS(DOMException.INVALID_STATE_ERR) OK

diff --git a/LayoutTests/media/encrypted-media/encrypted-media-syntax.html b/LayoutTests/media/encrypted-media/encrypted-media-syntax.html
index 3764833..bb19f82 100644 (file)
--- a/LayoutTests/media/encrypted-media/encrypted-media-syntax.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-syntax.html
@@ -61,7 +61,7 @@
             testException("video.webkitAddKey('webkit-org.w3.clearkey', undefined)", "DOMException.SYNTAX_ERR");
 
             consoleWrite("<br>0-length key is caught before load state is checked.");
-            testException("video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())", "DOMException.TYPE_MISMATCH_ERR");
+            testError("video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())", "'TypeError'");
 
             consoleWrite("<br>Key system validity is not checked before loading.");
             testException("video.webkitGenerateKeyRequest('com.example.invalid')", "DOMException.INVALID_STATE_ERR");

diff --git a/LayoutTests/media/video-test.js b/LayoutTests/media/video-test.js
index dceed6f..ef1e13c 100644 (file)
--- a/LayoutTests/media/video-test.js
+++ b/LayoutTests/media/video-test.js
@@ -211,6 +211,15 @@ function testException(testString, exceptionString)
     }
 }
 
+function testError(testString, errorName)
+{
+    try {
+        eval(testString);
+    } catch (ex) {
+        logResult(ex.name == eval(errorName), "TEST(" + testString + ") THROWS("+errorName+")");
+    }
+}
+
 var testEnded = false;
 
 function endTest()

diff --git a/LayoutTests/platform/chromium/fast/dynamic/insertAdjacentElement-expected.txt b/LayoutTests/platform/chromium/fast/dynamic/insertAdjacentElement-expected.txt
index 6f76b34..18d15f4 100644 (file)
--- a/LayoutTests/platform/chromium/fast/dynamic/insertAdjacentElement-expected.txt
+++ b/LayoutTests/platform/chromium/fast/dynamic/insertAdjacentElement-expected.txt
@@ -1,5 +1,5 @@
 Caught expected exception: Error: NOT_SUPPORTED_ERR: DOM Exception 9
-Caught expected exception: Error: TYPE_MISMATCH_ERR: DOM Exception 17
+Caught expected exception: TypeError: Type error
 1 (black) 2 (green) 3 (green) 4 (black) 
 
 PASS

diff --git a/LayoutTests/security/crypto-random-values-types-expected.txt b/LayoutTests/security/crypto-random-values-types-expected.txt
index ba73d70..aa90eac 100644 (file)
--- a/LayoutTests/security/crypto-random-values-types-expected.txt
+++ b/LayoutTests/security/crypto-random-values-types-expected.txt
@@ -11,7 +11,7 @@ PASS crypto.getRandomValues(new Uint16Array(3)) is undefined.
 PASS crypto.getRandomValues(new Int16Array(3)) is undefined.
 PASS crypto.getRandomValues(new Uint32Array(3)) is undefined.
 PASS crypto.getRandomValues(new Int32Array(3)) is undefined.
-PASS crypto.getRandomValues(new Float32Array(3)) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS crypto.getRandomValues(new Float32Array(3)) threw exception TypeError: Type error.
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/svg/dom/SVGTransformList-expected.txt b/LayoutTests/svg/dom/SVGTransformList-expected.txt
index 7ac93f6..b4d1129 100644 (file)
--- a/LayoutTests/svg/dom/SVGTransformList-expected.txt
+++ b/LayoutTests/svg/dom/SVGTransformList-expected.txt
@@ -11,8 +11,8 @@ PASS transform.createSVGTransformFromMatrix(svgElement) threw exception TypeErro
 PASS transform.createSVGTransformFromMatrix('aString') threw exception TypeError: Type error.
 PASS transform.createSVGTransformFromMatrix(1) threw exception TypeError: Type error.
 PASS transform.createSVGTransformFromMatrix(true) threw exception TypeError: Type error.
-PASS transform.createSVGTransformFromMatrix(undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS transform.createSVGTransformFromMatrix(null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS transform.createSVGTransformFromMatrix(undefined) threw exception TypeError: Type error.
+PASS transform.createSVGTransformFromMatrix(null) threw exception TypeError: Type error.
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 764ac24..11af555 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,52 @@
+2012-11-12  Erik Arvidsson  <arv@chromium.org>
+
+        Replace DOMException TYPE_MISMATCH_ERR with TypeError
+        https://bugs.webkit.org/show_bug.cgi?id=101604
+
+        Reviewed by Adam Barth.
+
+        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:
+
 2012-11-12  Joshua Bell  <jsbell@chromium.org>
 
         IndexedDB: Use sequence<> instead of DOMString[] in IDL

diff --git a/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp b/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp
index 739a042..1d34c33 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp
+++ b/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp
@@ -45,7 +45,7 @@ PassRefPtr<MediaConstraintsImpl> MediaConstraintsImpl::create(const Dictionary&
 {
     RefPtr<MediaConstraintsImpl> object = adoptRef(new MediaConstraintsImpl());
     if (!object->initialize(constraints)) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
     return object.release();

diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrackList.cpp b/Source/WebCore/Modules/mediastream/MediaStreamTrackList.cpp
index b20778e..fb783d5 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaStreamTrackList.cpp
+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrackList.cpp
@@ -80,7 +80,7 @@ void MediaStreamTrackList::add(PassRefPtr<MediaStreamTrack> prpTrack, ExceptionC
 
     RefPtr<MediaStreamTrack> track = prpTrack;
     if (!track) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -105,7 +105,7 @@ void MediaStreamTrackList::remove(PassRefPtr<MediaStreamTrack> prpTrack, Excepti
 
     RefPtr<MediaStreamTrack> track = prpTrack;
     if (!track) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 

diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
index 07e292e..2683c4e 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
@@ -124,7 +124,7 @@ void RTCDataChannel::setBinaryType(const String& binaryType, ExceptionCode& ec)
     else if (binaryType == "arraybuffer")
         m_binaryType = BinaryTypeArrayBuffer;
     else
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
 }
 
 void RTCDataChannel::send(const String& data, ExceptionCode& ec)

diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp b/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp
index d78fd67..2c267e1 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp
@@ -46,7 +46,7 @@ PassRefPtr<RTCIceCandidate> RTCIceCandidate::create(const Dictionary& dictionary
     String candidate;
     bool ok = dictionary.get("candidate", candidate);
     if (!ok || !candidate.length()) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
 

diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp b/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
index b781bbd..47a0ccd 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
@@ -69,14 +69,14 @@ PassRefPtr<RTCConfiguration> RTCPeerConnection::parseConfiguration(const Diction
     ArrayValue iceServers;
     bool ok = configuration.get("iceServers", iceServers);
     if (!ok || iceServers.isUndefinedOrNull()) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
 
     size_t numberOfServers;
     ok = iceServers.length(numberOfServers);
     if (!ok) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
 
@@ -86,19 +86,19 @@ PassRefPtr<RTCConfiguration> RTCPeerConnection::parseConfiguration(const Diction
         Dictionary iceServer;
         ok = iceServers.get(i, iceServer);
         if (!ok) {
-            ec = TYPE_MISMATCH_ERR;
+            ec = NATIVE_TYPE_ERR;
             return 0;
         }
 
         String urlString, credential;
         ok = iceServer.get("url", urlString);
         if (!ok) {
-            ec = TYPE_MISMATCH_ERR;
+            ec = NATIVE_TYPE_ERR;
             return 0;
         }
         KURL url(KURL(), urlString);
         if (!url.isValid() || !(url.protocolIs("turn") || url.protocolIs("stun"))) {
-            ec = TYPE_MISMATCH_ERR;
+            ec = NATIVE_TYPE_ERR;
             return 0;
         }
 
@@ -170,7 +170,7 @@ void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> su
     }
 
     if (!successCallback) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -190,7 +190,7 @@ void RTCPeerConnection::createAnswer(PassRefPtr<RTCSessionDescriptionCallback> s
     }
 
     if (!successCallback) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -211,7 +211,7 @@ void RTCPeerConnection::setLocalDescription(PassRefPtr<RTCSessionDescription> pr
 
     RefPtr<RTCSessionDescription> sessionDescription = prpSessionDescription;
     if (!sessionDescription) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -243,7 +243,7 @@ void RTCPeerConnection::setRemoteDescription(PassRefPtr<RTCSessionDescription> p
 
     RefPtr<RTCSessionDescription> sessionDescription = prpSessionDescription;
     if (!sessionDescription) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -294,7 +294,7 @@ void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, Exception
     }
 
     if (!iceCandidate) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -356,7 +356,7 @@ void RTCPeerConnection::addStream(PassRefPtr<MediaStream> prpStream, const Dicti
 
     RefPtr<MediaStream> stream = prpStream;
     if (!stream) {
-        ec =  TYPE_MISMATCH_ERR;
+        ec =  NATIVE_TYPE_ERR;
         return;
     }
 
@@ -382,7 +382,7 @@ void RTCPeerConnection::removeStream(MediaStream* stream, ExceptionCode& ec)
     }
 
     if (!stream) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 

diff --git a/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp b/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp
index 8978337..e64aa8c 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp
@@ -50,14 +50,14 @@ PassRefPtr<RTCSessionDescription> RTCSessionDescription::create(const Dictionary
     String type;
     bool ok = dictionary.get("type", type);
     if (!ok || !verifyType(type)) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
 
     String sdp;
     ok = dictionary.get("sdp", sdp);
     if (!ok || sdp.isEmpty()) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
 
@@ -89,7 +89,7 @@ void RTCSessionDescription::setType(const String& type, ExceptionCode& ec)
     if (verifyType(type))
         m_descriptor->setType(type);
     else
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
 }
 
 const String& RTCSessionDescription::sdp() const

diff --git a/Source/WebCore/bindings/js/CallbackFunction.cpp b/Source/WebCore/bindings/js/CallbackFunction.cpp
index 145d055..ef571a4 100644 (file)
--- a/Source/WebCore/bindings/js/CallbackFunction.cpp
+++ b/Source/WebCore/bindings/js/CallbackFunction.cpp
@@ -41,7 +41,7 @@ bool checkFunctionOnlyCallback(JSC::ExecState* exec, JSC::JSValue value, Callbac
 
     JSC::CallData callData;
     if (getCallData(value, callData) == JSC::CallTypeNone) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
+        setDOMException(exec, NATIVE_TYPE_ERR);
         return false;
     }
 

diff --git a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
index d1dc0b1..380d424 100644 (file)
--- a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
+++ b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
@@ -46,7 +46,7 @@ PassRefPtr<JSCustomXPathNSResolver> JSCustomXPathNSResolver::create(ExecState* e
 
     JSObject* resolverObject = value.getObject();
     if (!resolverObject) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
+        setDOMException(exec, NATIVE_TYPE_ERR);
         return 0;
     }
 

diff --git a/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp b/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
index f497da0..ed3e598 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
@@ -74,7 +74,7 @@ JSValue JSHTMLOptionsCollection::add(ExecState* exec)
         if (exec->hadException())
             return jsUndefined();
         if (!ok)
-            ec = TYPE_MISMATCH_ERR;
+            ec = NATIVE_TYPE_ERR;
         else
             imp->add(option, index, ec);
     }

diff --git a/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp
index 13ea8f3..7e34bec 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp
@@ -53,7 +53,7 @@ void selectIndexSetter(HTMLSelectElement* select, JSC::ExecState* exec, unsigned
         ExceptionCode ec = 0;
         HTMLOptionElement* option = toHTMLOptionElement(value);
         if (!option)
-            ec = TYPE_MISMATCH_ERR;
+            ec = NATIVE_TYPE_ERR;
         else
             select->setOption(index, option, ec);
         setDOMException(exec, ec);

diff --git a/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp b/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp
index ab5560d..d02fc67 100644 (file)
--- a/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp
+++ b/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp
@@ -49,7 +49,7 @@ EncodedJSValue JSC_HOST_CALL JSMutationObserverConstructor::constructJSMutationO
 
     JSObject* object = exec->argument(0).getObject();
     if (!object) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
+        setDOMException(exec, NATIVE_TYPE_ERR);
         return JSValue::encode(jsUndefined());
     }
 

diff --git a/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp b/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp
index 0d09375..cd5579a 100644 (file)
--- a/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp
@@ -45,7 +45,7 @@ JSValue JSSQLResultSetRowList::item(ExecState* exec)
     bool indexOk;
     int index = finiteInt32Value(exec->argument(0), exec, indexOk);
     if (!indexOk) {
-        setDOMException(exec, TYPE_MISMATCH_ERR);
+        setDOMException(exec, NATIVE_TYPE_ERR);
         return jsUndefined();
     }
     if (index < 0 || (unsigned)index >= m_impl->length()) {

diff --git a/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp b/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp
index 7a90c43..091cb15 100644 (file)
--- a/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp
@@ -59,7 +59,7 @@ JSValue JSSQLTransaction::executeSql(ExecState* exec)
     if (!exec->argument(1).isUndefinedOrNull()) {
         JSObject* object = exec->argument(1).getObject();
         if (!object) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
+            setDOMException(exec, NATIVE_TYPE_ERR);
             return jsUndefined();
         }
 
@@ -92,7 +92,7 @@ JSValue JSSQLTransaction::executeSql(ExecState* exec)
     if (!exec->argument(2).isUndefinedOrNull()) {
         JSObject* object = exec->argument(2).getObject();
         if (!object) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
+            setDOMException(exec, NATIVE_TYPE_ERR);
             return jsUndefined();
         }
 
@@ -103,7 +103,7 @@ JSValue JSSQLTransaction::executeSql(ExecState* exec)
     if (!exec->argument(3).isUndefinedOrNull()) {
         JSObject* object = exec->argument(3).getObject();
         if (!object) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
+            setDOMException(exec, NATIVE_TYPE_ERR);
             return jsUndefined();
         }
 

diff --git a/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp b/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp
index 33f8434..fe4f1b8 100644 (file)
--- a/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp
+++ b/Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp
@@ -58,7 +58,7 @@ JSValue JSSQLTransactionSync::executeSql(ExecState* exec)
     if (!exec->argument(1).isUndefinedOrNull()) {
         JSObject* object = exec->argument(1).getObject();
         if (!object) {
-            setDOMException(exec, TYPE_MISMATCH_ERR);
+            setDOMException(exec, NATIVE_TYPE_ERR);
             return jsUndefined();
         }
 

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 40d679d..8fea73a 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -2784,7 +2784,7 @@ sub GenerateParametersCheck
 
             if ($codeGenerator->IsSVGTypeNeedingTearOff($argType) and not $implClassName =~ /List$/) {
                 push(@$outputArray, "    if (!$name) {\n");
-                push(@$outputArray, "        setDOMException(exec, TYPE_MISMATCH_ERR);\n");
+                push(@$outputArray, "        setDOMException(exec, NATIVE_TYPE_ERR);\n");
                 push(@$outputArray, "        return JSValue::encode(jsUndefined());\n");
                 push(@$outputArray, "    }\n");
             }

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm b/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm
index c11ced3..9653ae9 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm
@@ -1591,7 +1591,7 @@ sub GenerateImplementation
                 $implIncludes{"ExceptionCode.h"} = 1;
                 push(@functionContent, "    $idlTypeWithNamespace* ${paramName}Core = $implGetter;\n");
                 push(@functionContent, "    if (!${paramName}Core) {\n");
-                push(@functionContent, "        WebCore::ExceptionCode ec = WebCore::TYPE_MISMATCH_ERR;\n");
+                push(@functionContent, "        WebCore::ExceptionCode ec = WebCore::NATIVE_TYPE_ERR;\n");
                 push(@functionContent, "        $exceptionRaiseOnError\n");
                 if ($returnType eq "void") { 
                     push(@functionContent, "        return;\n");

diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 4798c42..05af8fc 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -3591,7 +3591,7 @@ sub GenerateFunctionCallString()
         } elsif ($codeGenerator->IsSVGTypeNeedingTearOff($parameter->type) and not $implClassName =~ /List$/) {
             push @arguments, "$paramName->propertyReference()";
             $result .= $indent . "if (!$paramName)\n";
-            $result .= $indent . "    return setDOMException(WebCore::TYPE_MISMATCH_ERR, args.GetIsolate());\n";
+            $result .= $indent . "    return setDOMException(WebCore::NATIVE_TYPE_ERR, args.GetIsolate());\n";
         } elsif ($parameter->type eq "SVGMatrix" and $implClassName eq "SVGTransformList") {
             push @arguments, "$paramName.get()";
         } else {

diff --git a/Source/WebCore/bindings/v8/V8Callback.h b/Source/WebCore/bindings/v8/V8Callback.h
index 5fb5710..5d363cc 100644 (file)
--- a/Source/WebCore/bindings/v8/V8Callback.h
+++ b/Source/WebCore/bindings/v8/V8Callback.h
@@ -63,7 +63,7 @@ PassRefPtr<V8CallbackType> createFunctionOnlyCallback(v8::Local<v8::Value> value
 
     if (!value->IsFunction()) {
         succeeded = false;
-        setDOMException(TYPE_MISMATCH_ERR, isolate);
+        setDOMException(NATIVE_TYPE_ERR, isolate);
         return 0;
     }
 

diff --git a/Source/WebCore/bindings/v8/V8Collection.cpp b/Source/WebCore/bindings/v8/V8Collection.cpp
index a71dae3..0e152a8 100644 (file)
--- a/Source/WebCore/bindings/v8/V8Collection.cpp
+++ b/Source/WebCore/bindings/v8/V8Collection.cpp
@@ -46,9 +46,9 @@ v8::Handle<v8::Value> toOptionsCollectionSetter(uint32_t index, v8::Handle<v8::V
 
     ExceptionCode ec = 0;
 
-    // Check that the value is an HTMLOptionElement.  If not, throw a TYPE_MISMATCH_ERR DOMException.
+    // Check that the value is an HTMLOptionElement. If not, throw a TypeError.
     if (!V8HTMLOptionElement::HasInstance(value)) {
-        setDOMException(TYPE_MISMATCH_ERR, isolate);
+        setDOMException(NATIVE_TYPE_ERR, isolate);
         return value;
     }
 

diff --git a/Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp b/Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
index 597908c..d0fb870 100644 (file)
--- a/Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
@@ -77,7 +77,7 @@ v8::Handle<v8::Value> V8Document::evaluateCallback(const v8::Arguments& args)
 
     RefPtr<XPathNSResolver> resolver = toXPathNSResolver(args[2]);
     if (!resolver && !args[2]->IsNull() && !args[2]->IsUndefined())
-        return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
+        return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
 
     int type = toInt32(args[3]);
     RefPtr<XPathResult> inResult;

diff --git a/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp b/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp
index b223c23..0ee7843 100644 (file)
--- a/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp
@@ -55,7 +55,7 @@ v8::Handle<v8::Value> V8HTMLOptionsCollection::addCallback(const v8::Arguments&
 {
     INC_STATS("DOM.HTMLOptionsCollection.add()");
     if (!V8HTMLOptionElement::HasInstance(args[0]))
-        return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
+        return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
     HTMLOptionsCollection* imp = V8HTMLOptionsCollection::toNative(args.Holder());
     HTMLOptionElement* option = V8HTMLOptionElement::toNative(v8::Handle<v8::Object>(v8::Handle<v8::Object>::Cast(args[0])));
 
@@ -71,7 +71,7 @@ v8::Handle<v8::Value> V8HTMLOptionsCollection::addCallback(const v8::Arguments&
             return v8::Undefined();
 
         if (!ok)
-            ec = TYPE_MISMATCH_ERR;
+            ec = NATIVE_TYPE_ERR;
         else
             imp->add(option, index, ec);
     }

diff --git a/Source/WebCore/bindings/v8/custom/V8MutationObserverCustom.cpp b/Source/WebCore/bindings/v8/custom/V8MutationObserverCustom.cpp
index 68f4c7a..6e05cba 100644 (file)
--- a/Source/WebCore/bindings/v8/custom/V8MutationObserverCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8MutationObserverCustom.cpp
@@ -58,7 +58,7 @@ v8::Handle<v8::Value> V8MutationObserver::constructorCallback(const v8::Argument
 
     v8::Local<v8::Value> arg = args[0];
     if (!arg->IsObject())
-        return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
+        return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
 
     ScriptExecutionContext* context = getScriptExecutionContext();
 

diff --git a/Source/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp b/Source/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp
index 593acbb..4263e2b 100644 (file)
--- a/Source/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp
@@ -59,7 +59,7 @@ v8::Handle<v8::Value> V8SQLTransaction::executeSqlCallback(const v8::Arguments&
 
     if (args.Length() > 1 && !isUndefinedOrNull(args[1])) {
         if (!args[1]->IsObject())
-            return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
+            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
 
         uint32_t sqlArgsLength = 0;
         v8::Local<v8::Object> sqlArgsObject = args[1]->ToObject();
@@ -93,14 +93,14 @@ v8::Handle<v8::Value> V8SQLTransaction::executeSqlCallback(const v8::Arguments&
     RefPtr<SQLStatementCallback> callback;
     if (args.Length() > 2 && !isUndefinedOrNull(args[2])) {
         if (!args[2]->IsObject())
-            return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
+            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
         callback = V8SQLStatementCallback::create(args[2], scriptExecutionContext);
     }
 
     RefPtr<SQLStatementErrorCallback> errorCallback;
     if (args.Length() > 3 && !isUndefinedOrNull(args[3])) {
         if (!args[3]->IsObject())
-            return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
+            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
         errorCallback = V8SQLStatementErrorCallback::create(args[3], scriptExecutionContext);
     }
 

diff --git a/Source/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp b/Source/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp
index 1ab6626..d857adf 100644 (file)
--- a/Source/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp
+++ b/Source/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp
@@ -59,7 +59,7 @@ v8::Handle<v8::Value> V8SQLTransactionSync::executeSqlCallback(const v8::Argumen
 
     if (args.Length() > 1 && !isUndefinedOrNull(args[1])) {
         if (!args[1]->IsObject())
-            return setDOMException(TYPE_MISMATCH_ERR, args.GetIsolate());
+            return setDOMException(NATIVE_TYPE_ERR, args.GetIsolate());
 
         uint32_t sqlArgsLength = 0;
         v8::Local<v8::Object> sqlArgsObject = args[1]->ToObject();

diff --git a/Source/WebCore/dom/DOMCoreException.idl b/Source/WebCore/dom/DOMCoreException.idl
index 419202c..202c5d1 100644 (file)
--- a/Source/WebCore/dom/DOMCoreException.idl
+++ b/Source/WebCore/dom/DOMCoreException.idl
@@ -65,6 +65,7 @@
     // Introduced in DOM Level 3:
     const unsigned short      VALIDATION_ERR                 = 16;
     // Introduced in DOM Level 3:
+    // Deprecated in DOM Living Standard
     const unsigned short      TYPE_MISMATCH_ERR              = 17;
     // Introduced as an XHR extension:
     const unsigned short      SECURITY_ERR                   = 18;

diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp
index 9c664ab..8b08e45 100644 (file)
--- a/Source/WebCore/html/HTMLElement.cpp
+++ b/Source/WebCore/html/HTMLElement.cpp
@@ -546,8 +546,8 @@ Node* HTMLElement::insertAdjacent(const String& where, Node* newChild, Exception
 Element* HTMLElement::insertAdjacentElement(const String& where, Element* newChild, ExceptionCode& ec)
 {
     if (!newChild) {
-        // IE throws COM Exception E_INVALIDARG; this is the best DOM exception alternative.
-        ec = TYPE_MISMATCH_ERR;
+        // IE throws an Error with the message "Invalid argument.".
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
 

diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 3d25fb1..1946973 100644 (file)
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -2466,7 +2466,7 @@ void HTMLMediaElement::webkitAddKey(const String& keySystem, PassRefPtr<Uint8Arr
     }
 
     if (!key->length()) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 

diff --git a/Source/WebCore/html/HTMLOptionsCollection.cpp b/Source/WebCore/html/HTMLOptionsCollection.cpp
index 8d2aff9..6d95ce4 100644 (file)
--- a/Source/WebCore/html/HTMLOptionsCollection.cpp
+++ b/Source/WebCore/html/HTMLOptionsCollection.cpp
@@ -48,7 +48,7 @@ void HTMLOptionsCollection::add(PassRefPtr<HTMLOptionElement> element, int index
     HTMLOptionElement* newOption = element.get();
 
     if (!newOption) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 

diff --git a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index ef754f5..1dc0ea2 100644 (file)
--- a/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -1306,7 +1306,7 @@ static inline FloatRect normalizeRect(const FloatRect& rect)
 void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, float x, float y, ExceptionCode& ec)
 {
     if (!image) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     LayoutSize s = size(image);
@@ -1317,7 +1317,7 @@ void CanvasRenderingContext2D::drawImage(HTMLImageElement* image,
     float x, float y, float width, float height, ExceptionCode& ec)
 {
     if (!image) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     LayoutSize s = size(image);
@@ -1339,7 +1339,7 @@ void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRec
 void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect, const CompositeOperator& op, ExceptionCode& ec)
 {
     if (!image) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -1416,7 +1416,7 @@ void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, const
     const FloatRect& dstRect, ExceptionCode& ec)
 {
     if (!sourceCanvas) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -1481,7 +1481,7 @@ void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, const
 void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video, float x, float y, ExceptionCode& ec)
 {
     if (!video) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     IntSize s = size(video);
@@ -1492,7 +1492,7 @@ void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video,
                                          float x, float y, float width, float height, ExceptionCode& ec)
 {
     if (!video) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     IntSize s = size(video);
@@ -1510,7 +1510,7 @@ void CanvasRenderingContext2D::drawImage(HTMLVideoElement* video, const FloatRec
                                          ExceptionCode& ec)
 {
     if (!video) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 
@@ -1754,7 +1754,7 @@ PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLImageEleme
     const String& repetitionType, ExceptionCode& ec)
 {
     if (!image) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
     bool repeatX, repeatY;
@@ -1778,7 +1778,7 @@ PassRefPtr<CanvasPattern> CanvasRenderingContext2D::createPattern(HTMLCanvasElem
     const String& repetitionType, ExceptionCode& ec)
 {
     if (!canvas) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return 0;
     }
     if (!canvas->width() || !canvas->height()) {
@@ -1955,7 +1955,7 @@ PassRefPtr<ImageData> CanvasRenderingContext2D::getImageData(ImageBuffer::Coordi
 void CanvasRenderingContext2D::putImageData(ImageData* data, float dx, float dy, ExceptionCode& ec)
 {
     if (!data) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     putImageData(data, dx, dy, 0, 0, data->width(), data->height(), ec);
@@ -1964,7 +1964,7 @@ void CanvasRenderingContext2D::putImageData(ImageData* data, float dx, float dy,
 void CanvasRenderingContext2D::webkitPutImageDataHD(ImageData* data, float dx, float dy, ExceptionCode& ec)
 {
     if (!data) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     webkitPutImageDataHD(data, dx, dy, 0, 0, data->width(), data->height(), ec);
@@ -1985,7 +1985,7 @@ void CanvasRenderingContext2D::putImageData(ImageData* data, ImageBuffer::Coordi
                                             float dirtyWidth, float dirtyHeight, ExceptionCode& ec)
 {
     if (!data) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     if (!isfinite(dx) || !isfinite(dy) || !isfinite(dirtyX) || !isfinite(dirtyY) || !isfinite(dirtyWidth) || !isfinite(dirtyHeight)) {

diff --git a/Source/WebCore/page/Crypto.cpp b/Source/WebCore/page/Crypto.cpp
index 16709e9..81753e8 100644 (file)
--- a/Source/WebCore/page/Crypto.cpp
+++ b/Source/WebCore/page/Crypto.cpp
@@ -60,7 +60,7 @@ void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
 {
 #if USE(OS_RANDOMNESS)
     if (!array || !isIntegerArray(array)) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
     if (array->byteLength() > 65536) {

diff --git a/Source/WebCore/page/DOMSelection.cpp b/Source/WebCore/page/DOMSelection.cpp
index 062443a..ba7f514 100644 (file)
--- a/Source/WebCore/page/DOMSelection.cpp
+++ b/Source/WebCore/page/DOMSelection.cpp
@@ -336,7 +336,7 @@ void DOMSelection::extend(Node* node, int offset, ExceptionCode& ec)
         return;
 
     if (!node) {
-        ec = TYPE_MISMATCH_ERR;
+        ec = NATIVE_TYPE_ERR;
         return;
     }
 

diff --git a/Source/WebCore/svg/properties/SVGTransformListPropertyTearOff.h b/Source/WebCore/svg/properties/SVGTransformListPropertyTearOff.h
index 7ac124f..2f89e33 100644 (file)
--- a/Source/WebCore/svg/properties/SVGTransformListPropertyTearOff.h
+++ b/Source/WebCore/svg/properties/SVGTransformListPropertyTearOff.h
@@ -42,7 +42,7 @@ public:
     {
         ASSERT(m_values);
         if (!matrix) {
-            ec = TYPE_MISMATCH_ERR;
+            ec = NATIVE_TYPE_ERR;
             return 0;
         }
         return SVGPropertyTearOff<SVGTransform>::create(m_values->createSVGTransformFromMatrix(matrix->propertyReference()));