Diff
Modified: trunk/LayoutTests/ChangeLog (219765 => 219766)
--- trunk/LayoutTests/ChangeLog 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/ChangeLog 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,48 @@
+2017-07-22 Chris Dumez <[email protected]>
+
+ Merge ExceptionBase into DOMException and drop custom toString
+ https://bugs.webkit.org/show_bug.cgi?id=174755
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline some tests now that DOMException's custom toString has been dropped
+ and we rely on Error's toString. This causes the exception message to be
+ slightly different.
+
+ * fast/canvas/canvas-getImageData-invalid-result-buffer-crash-expected.txt:
+ * fast/frames/sandboxed-iframe-history-denied-expected.txt:
+ * fast/frames/sandboxed-iframe-navigation-top-denied-expected.txt:
+ * fast/inspector-support/uncaught-dom1-exception-expected.txt:
+ * fast/inspector-support/uncaught-dom3-exception-expected.txt:
+ * fast/inspector-support/uncaught-dom8-exception-expected.txt:
+ * fast/regions/selection/crash-deselect-expected.txt:
+ * http/tests/security/listener/xss-JSTargetNode-onclick-addEventListener-expected.txt:
+ * http/tests/security/listener/xss-JSTargetNode-onclick-shortcut-expected.txt:
+ * http/tests/security/listener/xss-XMLHttpRequest-addEventListener-expected.txt:
+ * http/tests/security/listener/xss-XMLHttpRequest-shortcut-expected.txt:
+ * http/tests/security/listener/xss-window-onclick-addEventListener-expected.txt:
+ * http/tests/security/listener/xss-window-onclick-shortcut-expected.txt:
+ * http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt:
+ * http/tests/security/sandboxed-iframe-modify-self-expected.txt:
+ * http/tests/security/srcdoc-in-sandbox-cannot-access-parent-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-hash-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-host-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-hostname-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-nonstandardProperty-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-pathname-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-protocol-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-reload-expected.txt:
+ * http/tests/security/xss-DENIED-assign-location-search-expected.txt:
+ * http/tests/security/xss-DENIED-frame-name-expected.txt:
+ * http/tests/security/xss-DENIED-sandboxed-iframe-expected.txt:
+ * http/tests/security/xss-DENIED-window-name-navigator-expected.txt:
+ * inspector/debugger/command-line-api-exception-expected.txt:
+ * inspector/debugger/regress-133182-expected.txt:
+ * inspector/debugger/setPauseOnExceptions-all-expected.txt:
+ * inspector/debugger/setPauseOnExceptions-none-expected.txt:
+ * inspector/debugger/setPauseOnExceptions-uncaught-expected.txt:
+ * platform/mac/fast/dynamic/015-expected.txt:
+
2017-07-21 Chris Dumez <[email protected]>
Drop IDBDatabaseException class
Modified: trunk/LayoutTests/fast/canvas/canvas-getImageData-invalid-result-buffer-crash-expected.txt (219765 => 219766)
--- trunk/LayoutTests/fast/canvas/canvas-getImageData-invalid-result-buffer-crash-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/fast/canvas/canvas-getImageData-invalid-result-buffer-crash-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: line 8: Unable to get image data from canvas. Requested size was 381000000 x 2
-CONSOLE MESSAGE: line 8: InvalidStateError (DOM Exception 11): The object is in an invalid state.
+CONSOLE MESSAGE: line 8: InvalidStateError: The object is in an invalid state.
PASSED (If this page did not crash.)
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/frames/sandboxed-iframe-history-denied-expected.txt (219765 => 219766)
--- trunk/LayoutTests/fast/frames/sandboxed-iframe-history-denied-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/fast/frames/sandboxed-iframe-history-denied-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 1: SecurityError (DOM Exception 18): Sandbox access violation: Blocked a frame at "null" from accessing a frame at "". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
+CONSOLE MESSAGE: line 1: SecurityError: Sandbox access violation: Blocked a frame at "null" from accessing a frame at "". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
ALERT: PASS
This test verifies that a sandboxed IFrame cannot navigate the top-level frame using the history API.
Modified: trunk/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied-expected.txt (219765 => 219766)
--- trunk/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,6 +1,6 @@
CONSOLE MESSAGE: Unsafe _javascript_ attempt to initiate navigation for frame with URL 'navigate-top-to-fail.html'. The frame attempting navigation of the top-level window is sandboxed, but the 'allow-top-navigation' flag is not set.
-CONSOLE MESSAGE: SecurityError (DOM Exception 18): The operation is insecure.
+CONSOLE MESSAGE: SecurityError: The operation is insecure.
This test verifies that a sandboxed IFrame cannot navigate the top-level frame without allow-top-navigation. This test passes if the navigation does not occur.
Modified: trunk/LayoutTests/fast/inspector-support/uncaught-dom1-exception-expected.txt (219765 => 219766)
--- trunk/LayoutTests/fast/inspector-support/uncaught-dom1-exception-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/fast/inspector-support/uncaught-dom1-exception-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,2 +1,2 @@
-CONSOLE MESSAGE: line 12: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 12: IndexSizeError: The index is not in the allowed range.
This tests that we are getting the correct message for DOM Exception 1: INDEX_SIZE_ERR.
Modified: trunk/LayoutTests/fast/inspector-support/uncaught-dom3-exception-expected.txt (219765 => 219766)
--- trunk/LayoutTests/fast/inspector-support/uncaught-dom3-exception-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/fast/inspector-support/uncaught-dom3-exception-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,2 +1,2 @@
-CONSOLE MESSAGE: line 9: HierarchyRequestError (DOM Exception 3): The operation would yield an incorrect node tree.
+CONSOLE MESSAGE: line 9: HierarchyRequestError: The operation would yield an incorrect node tree.
This tests that we are getting the correct message for DOM Exception 3: HIERARCHY_REQUEST_ERR.
Modified: trunk/LayoutTests/fast/inspector-support/uncaught-dom8-exception-expected.txt (219765 => 219766)
--- trunk/LayoutTests/fast/inspector-support/uncaught-dom8-exception-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/fast/inspector-support/uncaught-dom8-exception-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,2 +1,2 @@
-CONSOLE MESSAGE: line 9: NotFoundError (DOM Exception 8): The object can not be found here.
+CONSOLE MESSAGE: line 9: NotFoundError: The object can not be found here.
This tests that we are getting the correct message for DOM Exception 8: NOT_FOUND_ERR.
Modified: trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt (219765 => 219766)
--- trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 66: HierarchyRequestError (DOM Exception 3): The operation would yield an incorrect node tree.
+CONSOLE MESSAGE: line 66: HierarchyRequestError: The operation would yield an incorrect node tree.
Errlog selectionTest: HierarchyRequestError: The operation would yield an incorrect node tree. : index 1
Errlog webtest_fn_24:
Modified: trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 1: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 1: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This page opens a window to "", injects malicious code, and then navigates its opener to the victim. The opened window then tries to scripts its opener after document.writeing a new document.
Code injected into window:
<script>document.write('<script>function write(target, message) { target.document.body.innerHTML = message; }setTimeout(function() {write(window.opener, \'FAIL: XSS was allowed.\');}, 100);setTimeout(function() {write(window.opener.top.frames[1], \'SUCCESS: Window remained in original SecurityOrigin.\');}, 200);setTimeout(function() { if (window.testRunner) testRunner.globalFlag = true; }, 300);<\/script>');</script>
Modified: trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-_javascript_-url-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-_javascript_-url-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-_javascript_-url-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 1: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 1: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This page opens a window to "", injects malicious code, and then navigates its opener to the victim. The opened window then tries to scripts its opener after reloading itself as a _javascript_ URL.
Code injected into window:
<script>window.location = '_javascript_:\'<script>function write(target, message) { target.document.body.innerHTML = message; }setTimeout(function() {write(window.opener, \\\'FAIL: XSS was allowed.\\\');}, 100);setTimeout(function() {write(window.opener.top.frames[1], \\\'SUCCESS: Window remained in original SecurityOrigin.\\\');}, 200);setTimeout(function() { if (window.testRunner) testRunner.globalFlag = true; }, 300);<\\\/script>\''</script>
Modified: trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 55: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
-CONSOLE MESSAGE: line 1: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 55: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 1: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This page opens a window to "", injects malicious code, and then uses window.open.call to set its opener to the victim. The opened window then tries to scripts its opener.
Code injected into window:
<script>function write(target, message) { target.document.body.innerHTML = message; }
Modified: trunk/LayoutTests/http/tests/security/listener/xss-JSTargetNode-onclick-addEventListener-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/listener/xss-JSTargetNode-onclick-addEventListener-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/listener/xss-JSTargetNode-onclick-addEventListener-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 9: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 9: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This tests that frame used when setting eventListeners on an EventTarget using addEventListener is the target nodes frame. (rdar://problem/5426142). This test passes if you don't see an alert dialog with the domain of "localhost" in it and an "Unsafe _javascript_" warning is logged to the console.
Modified: trunk/LayoutTests/http/tests/security/listener/xss-JSTargetNode-onclick-shortcut-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/listener/xss-JSTargetNode-onclick-shortcut-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/listener/xss-JSTargetNode-onclick-shortcut-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 9: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 9: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This tests that frame used when setting eventListeners on an EventTarget with the shortcut (onclick, etc), is the target nodes frame. (rdar://problem/5426142). This test passes if you don't see an alert dialog with the domain of "localhost" in it and an "Unsafe _javascript_" warning is logged to the console.
Modified: trunk/LayoutTests/http/tests/security/listener/xss-XMLHttpRequest-addEventListener-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/listener/xss-XMLHttpRequest-addEventListener-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/listener/xss-XMLHttpRequest-addEventListener-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 9: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 9: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This tests that frame used when setting eventListeners on an XMLHttpRequest using addEventListener, is the requests frame. (rdar://problem/5426142). This test passes if you don't see an alert dialog with the domain of "localhost" in it and an "Unsafe _javascript_" warning is logged to the console.
Modified: trunk/LayoutTests/http/tests/security/listener/xss-XMLHttpRequest-shortcut-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/listener/xss-XMLHttpRequest-shortcut-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/listener/xss-XMLHttpRequest-shortcut-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 9: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 9: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This tests that frame used when setting eventListeners on an XMLHttpRequest with the shortcut (onreadystatechange), is the requests frame. (rdar://problem/5426142). This test passes if you don't see an alert dialog with the domain of "localhost" in it and an "Unsafe _javascript_" warning is logged to the console.
Modified: trunk/LayoutTests/http/tests/security/listener/xss-window-onclick-addEventListener-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/listener/xss-window-onclick-addEventListener-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/listener/xss-window-onclick-addEventListener-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 9: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 9: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This tests that frame used when setting eventListeners on the window using addEventListener is the window's frame. (rdar://problem/5426142). This test passes if you don't see an alert dialog with the domain of "localhost" in it and an "Unsafe _javascript_" warning is logged to the console.
Modified: trunk/LayoutTests/http/tests/security/listener/xss-window-onclick-shortcut-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/listener/xss-window-onclick-shortcut-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/listener/xss-window-onclick-shortcut-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 9: SecurityError (DOM Exception 18): Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 9: SecurityError: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
This tests that frame used when setting eventListeners on the window with the shortcut (onclick, etc), is the window's frame. (rdar://problem/5426142). This test passes if you don't see an alert dialog with the domain of "localhost" in it and an "Unsafe _javascript_" warning is logged to the console.
Modified: trunk/LayoutTests/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/sandboxed-iframe-blocks-access-from-parent-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 12: SecurityError (DOM Exception 18): Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "http://127.0.0.1:8000". The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
+CONSOLE MESSAGE: line 12: SecurityError: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "http://127.0.0.1:8000". The frame being accessed is sandboxed and lacks the "allow-same-origin" flag.
Sandboxing a frame puts it into a unique origin by default, which the containing document shouldn't have script access to. This test passes if a console warning is generated, noting the access violation.
Modified: trunk/LayoutTests/http/tests/security/sandboxed-iframe-modify-self-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/sandboxed-iframe-modify-self-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/sandboxed-iframe-modify-self-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 9: SecurityError (DOM Exception 18): Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
+CONSOLE MESSAGE: line 9: SecurityError: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
This is a "sanity" test case to verify that a sandboxed frame cannot break out of its sandbox by modifying its own sandbox attribute. Two attempts are made:
First, an attempt is made to modify the sandbox attribute of the "self" object, referring to the frame's window. This should not have any effect (the attribute is associated with the iframe DOM node, not the window). No warning is expected.
Modified: trunk/LayoutTests/http/tests/security/srcdoc-in-sandbox-cannot-access-parent-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/srcdoc-in-sandbox-cannot-access-parent-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/srcdoc-in-sandbox-cannot-access-parent-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Sandbox access violation: Blocked a frame at "null" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
+CONSOLE MESSAGE: line 4: SecurityError: Sandbox access violation: Blocked a frame at "null" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
PASS
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-hash-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-hash-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-hash-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.hash not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-host-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-host-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-host-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.host not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-hostname-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-hostname-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-hostname-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.hostname not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-nonstandardProperty-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-nonstandardProperty-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-nonstandardProperty-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.nonstandardProperty not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-pathname-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-pathname-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-pathname-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.pathname not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-protocol-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-protocol-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-protocol-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.protocol not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-reload-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-reload-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-reload-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.replace not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-search-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-search-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-assign-location-search-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 4: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
PASS: cross-site assignment of location.search not allowed
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-frame-name-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-frame-name-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-frame-name-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,2 +1,2 @@
-CONSOLE MESSAGE: line 2: SecurityError (DOM Exception 18): Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
+CONSOLE MESSAGE: line 2: SecurityError: Blocked a frame with origin "http://localhost:8000" from accessing a frame with origin "http://127.0.0.1:8000". Protocols, domains, and ports must match.
This test passes if it doesn't alert fail.
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-sandboxed-iframe-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-sandboxed-iframe-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-sandboxed-iframe-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 4: SecurityError (DOM Exception 18): Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
+CONSOLE MESSAGE: line 4: SecurityError: Sandbox access violation: Blocked a frame at "http://127.0.0.1:8000" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
This test verifies that sandboxed iframe prevents cross-domain script access. It will print "PASS" on success.
Modified: trunk/LayoutTests/http/tests/security/xss-DENIED-window-name-navigator-expected.txt (219765 => 219766)
--- trunk/LayoutTests/http/tests/security/xss-DENIED-window-name-navigator-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/http/tests/security/xss-DENIED-window-name-navigator-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,2 +1,2 @@
-CONSOLE MESSAGE: line 1: SecurityError (DOM Exception 18): Sandbox access violation: Blocked a frame at "null" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
+CONSOLE MESSAGE: line 1: SecurityError: Sandbox access violation: Blocked a frame at "null" from accessing a frame at "http://127.0.0.1:8000". The frame requesting access is sandboxed and lacks the "allow-same-origin" flag.
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,27 @@
+2017-07-22 Chris Dumez <[email protected]>
+
+ Merge ExceptionBase into DOMException and drop custom toString
+ https://bugs.webkit.org/show_bug.cgi?id=174755
+
+ Reviewed by Sam Weinig.
+
+ Rebaseline some tests now that DOMException's custom toString has been dropped
+ and we rely on Error's toString. This causes the exception message to be
+ slightly different.
+
+ * web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_bits.https-expected.txt:
+ * web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_keys.https-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_match_origin-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_match_wildcard-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_multi-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_null-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_origin-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_origin_uppercase-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_space-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_wildcard-expected.txt:
+ * web-platform-tests/resource-timing/resource_TAO_zero-expected.txt:
+ * web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-expected.txt:
+
2017-07-21 Chris Dumez <[email protected]>
Drop IDBDatabaseException class
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_bits.https-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_bits.https-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_bits.https-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 198: Unhandled Promise Rejection: DataError (DOM Exception): Data provided to an operation does not meet requirements
+CONSOLE MESSAGE: line 198: Unhandled Promise Rejection: DataError: Data provided to an operation does not meet requirements
deriveBits Tests for ECDH
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_keys.https-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_keys.https-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/WebCryptoAPI/derive_bits_keys/test_ecdh_keys.https-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 167: Unhandled Promise Rejection: DataError (DOM Exception): Data provided to an operation does not meet requirements
+CONSOLE MESSAGE: line 167: Unhandled Promise Rejection: DataError: Data provided to an operation does not meet requirements
deriveKey Tests for ECDH
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_match_origin-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_match_origin-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_match_origin-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=match_origin
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match for the value of the origin of the current document.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_match_wildcard-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_match_wildcard-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_match_wildcard-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=match_wildcard
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard ("*").
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_multi-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_multi-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_multi-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=multi
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will pass when the HTTP response has multiple Timing-Allow-Origin header fields and the subsequent field value is separated by a comma.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_null-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_null-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_null-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=null
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will fail when the value of Timing-Allow-Origin is null.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_origin-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_origin-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_origin-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=origin
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will pass when the value of Timing-Allow-Origin is a case-sensitive match for the value of the origin of the current document.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_origin_uppercase-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_origin_uppercase-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_origin_uppercase-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=uppercase
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will fail when the value of Timing-Allow-Origin is NOT a case-sensitive match for the value of the origin of the current document.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_space-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_space-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_space-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=space
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will fail if the Timing-Allow-Origin header value list contains [origin|*]{2,}, separated by space.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_wildcard-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_wildcard-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_wildcard-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=wildcard
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will pass when the Timing-Allow-Origin header value is a wildcard ("*").
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_zero-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_zero-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/resource-timing/resource_TAO_zero-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,5 +1,5 @@
Blocked access to external URL http://www.localhost:8800/resource-timing/resources/TAOResponse.py?tao=zero
-CONSOLE MESSAGE: line 13: AbortError (DOM Exception 20): The operation was aborted.
+CONSOLE MESSAGE: line 13: AbortError: The operation was aborted.
Description
This test validates that for a cross origin resource, the timing allow check algorithm will fail when the HTTP response includes zero Timing-Allow-Origin header value.
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-expected.txt (219765 => 219766)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addIceCandidate-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,7 +1,7 @@
-CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError (DOM Exception): Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
-CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError (DOM Exception): Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
-CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError (DOM Exception): Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
-CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError (DOM Exception): Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
+CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError: Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
+CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError: Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
+CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError: Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
+CONSOLE MESSAGE: Unhandled Promise Rejection: OperationError: Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
Harness Error (FAIL), message = Failed to set remote offer sdp: Session error code: ERROR_CONTENT. Session error description: Failed to set remote video description send parameters..
Modified: trunk/LayoutTests/inspector/debugger/command-line-api-exception-expected.txt (219765 => 219766)
--- trunk/LayoutTests/inspector/debugger/command-line-api-exception-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/inspector/debugger/command-line-api-exception-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,7 +1,7 @@
CONSOLE MESSAGE: line 4: TypeError: undefined is not an object (evaluating '[].x.x')
CONSOLE MESSAGE: line 10: ReferenceError: Can't find variable: variableThatDoesNotExist
CONSOLE MESSAGE: line 16: SyntaxError: Unexpected token ')'
-CONSOLE MESSAGE: line 22: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 22: IndexSizeError: The index is not in the allowed range.
CONSOLE MESSAGE: line 27: thrown string
CONSOLE MESSAGE: line 32: 123.456
CONSOLE MESSAGE: line 37: null
@@ -31,7 +31,7 @@
-- Running test case: UncaughtDOMException
$exception => IndexSizeError: The index is not in the allowed range.
-Uncaught exception in test page: IndexSizeError (DOM Exception 1): The index is not in the allowed range. [exceptions.js:22]
+Uncaught exception in test page: IndexSizeError: The index is not in the allowed range. [exceptions.js:22]
-- Running test case: UncaughtString
$exception => thrown string
Modified: trunk/LayoutTests/inspector/debugger/regress-133182-expected.txt (219765 => 219766)
--- trunk/LayoutTests/inspector/debugger/regress-133182-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/inspector/debugger/regress-133182-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,6 +1,6 @@
CONSOLE MESSAGE: line 1: TypeError: undefined is not an object (evaluating '({}).a.b')
CONSOLE MESSAGE: line 3: TypeError: undefined is not an object (evaluating '({}).a.b')
-CONSOLE MESSAGE: line 8: NotFoundError (DOM Exception 8): The object can not be found here.
+CONSOLE MESSAGE: line 8: NotFoundError: The object can not be found here.
CONSOLE MESSAGE: line 24: exception in host function
CONSOLE MESSAGE: line 13: exception string
CONSOLE MESSAGE: line 18: [object Object]
Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all-expected.txt (219765 => 219766)
--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-all-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -6,7 +6,7 @@
CONSOLE MESSAGE: line 38: catchNested caught exception: {"line":1,"column":61}
CONSOLE MESSAGE: line 1: TypeError: undefined is not an object (evaluating '({}).a.b')
CONSOLE MESSAGE: line 3: TypeError: undefined is not an object (evaluating '({}).a.b')
-CONSOLE MESSAGE: line 8: NotFoundError (DOM Exception 8): The object can not be found here.
+CONSOLE MESSAGE: line 8: NotFoundError: The object can not be found here.
CONSOLE MESSAGE: line 24: exception in host function
CONSOLE MESSAGE: line 13: exception string
CONSOLE MESSAGE: line 18: [object Object]
Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none-expected.txt (219765 => 219766)
--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-none-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -5,7 +5,7 @@
CONSOLE MESSAGE: line 38: catchNested caught exception: "exception string"
CONSOLE MESSAGE: line 38: catchNested caught exception: {"line":1,"column":61}
CONSOLE MESSAGE: line 3: TypeError: undefined is not an object (evaluating '({}).a.b')
-CONSOLE MESSAGE: line 8: NotFoundError (DOM Exception 8): The object can not be found here.
+CONSOLE MESSAGE: line 8: NotFoundError: The object can not be found here.
CONSOLE MESSAGE: line 24: exception in host function
CONSOLE MESSAGE: line 13: exception string
CONSOLE MESSAGE: line 18: [object Object]
Modified: trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught-expected.txt (219765 => 219766)
--- trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/inspector/debugger/setPauseOnExceptions-uncaught-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -6,7 +6,7 @@
CONSOLE MESSAGE: line 38: catchNested caught exception: {"line":1,"column":61}
CONSOLE MESSAGE: line 1: TypeError: undefined is not an object (evaluating '({}).a.b')
CONSOLE MESSAGE: line 3: TypeError: undefined is not an object (evaluating '({}).a.b')
-CONSOLE MESSAGE: line 8: NotFoundError (DOM Exception 8): The object can not be found here.
+CONSOLE MESSAGE: line 8: NotFoundError: The object can not be found here.
CONSOLE MESSAGE: line 24: exception in host function
CONSOLE MESSAGE: line 13: exception string
CONSOLE MESSAGE: line 18: [object Object]
Modified: trunk/LayoutTests/platform/gtk/fast/dynamic/015-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/gtk/fast/dynamic/015-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/gtk/fast/dynamic/015-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 16: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 16: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/LayoutTests/platform/ios/fast/attachment/attachment-select-on-click-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios/fast/attachment/attachment-select-on-click-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios/fast/attachment/attachment-select-on-click-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 24: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 24: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x150
Modified: trunk/LayoutTests/platform/ios/fast/dynamic/015-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios/fast/dynamic/015-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios/fast/dynamic/015-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 16: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 16: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-2-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-2-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-2-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-2-left-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-2-left-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-2-left-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-right-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-right-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-ltr-right-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-2-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-2-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-2-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-2-left-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-2-left-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-2-left-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-right-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-right-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/ios-wk2/editing/selection/caret-rtl-right-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 27: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 27: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x126
Modified: trunk/LayoutTests/platform/mac/fast/dynamic/015-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/mac/fast/dynamic/015-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/mac/fast/dynamic/015-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 16: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 16: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/LayoutTests/platform/win/fast/dynamic/015-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/win/fast/dynamic/015-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/win/fast/dynamic/015-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 16: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 16: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/LayoutTests/platform/wpe/fast/dynamic/015-expected.txt (219765 => 219766)
--- trunk/LayoutTests/platform/wpe/fast/dynamic/015-expected.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/LayoutTests/platform/wpe/fast/dynamic/015-expected.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 16: IndexSizeError (DOM Exception 1): The index is not in the allowed range.
+CONSOLE MESSAGE: line 16: IndexSizeError: The index is not in the allowed range.
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
Modified: trunk/Source/WebCore/CMakeLists.txt (219765 => 219766)
--- trunk/Source/WebCore/CMakeLists.txt 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1525,7 +1525,6 @@
dom/EventNames.cpp
dom/EventPath.cpp
dom/EventTarget.cpp
- dom/ExceptionBase.cpp
dom/ExceptionCodeDescription.cpp
dom/ExtensionStyleSheets.cpp
dom/FocusEvent.cpp
Modified: trunk/Source/WebCore/ChangeLog (219765 => 219766)
--- trunk/Source/WebCore/ChangeLog 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/ChangeLog 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,3 +1,29 @@
+2017-07-22 Chris Dumez <[email protected]>
+
+ Merge ExceptionBase into DOMException and drop custom toString
+ https://bugs.webkit.org/show_bug.cgi?id=174755
+
+ Reviewed by Sam Weinig.
+
+ Merge ExceptionBase into DOMException and drop custom toString, now that DOMException
+ is the only remaining exception type.
+
+ * CMakeLists.txt:
+ * Modules/mediastream/MediaStream.h:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSDOMExceptionHandling.cpp:
+ (WebCore::retrieveErrorMessage):
+ * dom/DOMAllInOne.cpp:
+ * dom/DOMException.cpp:
+ (WebCore::DOMException::DOMException):
+ (WebCore::DOMException::initializeDescription):
+ * dom/DOMException.h:
+ (WebCore::DOMException::code):
+ (WebCore::DOMException::name):
+ (WebCore::DOMException::message):
+ * dom/ExceptionBase.cpp: Removed.
+ * dom/ExceptionBase.h: Removed.
+
2017-07-14 Filip Pizlo <[email protected]>
It should be easy to decide how WebKit yields
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (219765 => 219766)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-07-22 21:20:23 UTC (rev 219766)
@@ -31,7 +31,6 @@
#include "ActiveDOMObject.h"
#include "EventTarget.h"
-#include "ExceptionBase.h"
#include "MediaCanStartListener.h"
#include "MediaProducer.h"
#include "MediaStreamPrivate.h"
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (219765 => 219766)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-07-22 21:20:23 UTC (rev 219766)
@@ -5669,8 +5669,6 @@
BC60D6E90D28D83400B9918F /* DOMException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D6E80D28D83400B9918F /* DOMException.h */; };
BC60D7C00D29A46300B9918F /* JSDOMException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60D7BE0D29A46300B9918F /* JSDOMException.cpp */; };
BC60D7C10D29A46300B9918F /* JSDOMException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D7BF0D29A46300B9918F /* JSDOMException.h */; };
- BC60D8F20D2A11E000B9918F /* ExceptionBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60D8F00D2A11E000B9918F /* ExceptionBase.cpp */; };
- BC60D8F30D2A11E000B9918F /* ExceptionBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60D8F10D2A11E000B9918F /* ExceptionBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC64640A11D7F304006455B0 /* DOMStringMap.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64640811D7F304006455B0 /* DOMStringMap.h */; };
BC64641C11D7F416006455B0 /* DatasetDOMStringMap.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */; };
BC64641D11D7F416006455B0 /* DatasetDOMStringMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */; };
@@ -14106,8 +14104,6 @@
BC60D6EB0D28D99900B9918F /* DOMException.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMException.idl; sourceTree = "<group>"; };
BC60D7BE0D29A46300B9918F /* JSDOMException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMException.cpp; sourceTree = "<group>"; };
BC60D7BF0D29A46300B9918F /* JSDOMException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMException.h; sourceTree = "<group>"; };
- BC60D8F00D2A11E000B9918F /* ExceptionBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionBase.cpp; sourceTree = "<group>"; };
- BC60D8F10D2A11E000B9918F /* ExceptionBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionBase.h; sourceTree = "<group>"; };
BC64640811D7F304006455B0 /* DOMStringMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStringMap.h; sourceTree = "<group>"; };
BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatasetDOMStringMap.h; sourceTree = "<group>"; };
BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatasetDOMStringMap.cpp; sourceTree = "<group>"; };
@@ -25637,8 +25633,6 @@
85AFA7420AAF298400E84305 /* EventTarget.idl */,
CDCE5CD014633BC900D47CCA /* EventTargetFactory.in */,
93D196321D6CAB8200FC7E47 /* Exception.h */,
- BC60D8F00D2A11E000B9918F /* ExceptionBase.cpp */,
- BC60D8F10D2A11E000B9918F /* ExceptionBase.h */,
935FBCF109BA143B00E230B1 /* ExceptionCode.h */,
83D3B0091F226FB300D34D88 /* ExceptionCodeDescription.cpp */,
83D3B00A1F226FB300D34D88 /* ExceptionCodeDescription.h */,
@@ -27128,7 +27122,6 @@
97AA3CA6145237CC003E1DA6 /* EventTargetInterfaces.h in Headers */,
262EC41A1D078FB900BA78FC /* EventTrackingRegions.h in Headers */,
93D196331D6CAB8200FC7E47 /* Exception.h in Headers */,
- BC60D8F30D2A11E000B9918F /* ExceptionBase.h in Headers */,
935FBCF209BA143B00E230B1 /* ExceptionCode.h in Headers */,
93D196311D6CAB7600FC7E47 /* ExceptionOr.h in Headers */,
31DCDF441DA1C45400EA5B93 /* ExtendedColor.h in Headers */,
@@ -31108,7 +31101,6 @@
E0FEF372B27C53EAC1C1FBEE /* EventSource.cpp in Sources */,
E12EDBEA0B308E0B002704B6 /* EventTarget.cpp in Sources */,
262EC41D1D110B9000BA78FC /* EventTrackingRegions.cpp in Sources */,
- BC60D8F20D2A11E000B9918F /* ExceptionBase.cpp in Sources */,
724ED32C1A3A7E5400F5F13C /* EXTBlendMinMax.cpp in Sources */,
31DCDF431DA1C45400EA5B93 /* ExtendedColor.cpp in Sources */,
6E67D2A61280E8A4008758F7 /* Extensions3DOpenGL.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSDOMExceptionHandling.cpp (219765 => 219766)
--- trunk/Source/WebCore/bindings/js/JSDOMExceptionHandling.cpp 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/bindings/js/JSDOMExceptionHandling.cpp 2017-07-22 21:20:23 UTC (rev 219766)
@@ -58,9 +58,6 @@
String retrieveErrorMessage(ExecState& state, VM& vm, JSValue exception, CatchScope& catchScope)
{
- if (auto* domException = JSDOMException::toWrapped(vm, exception))
- return domException->toString();
-
// FIXME: <http://webkit.org/b/115087> Web Inspector: WebCore::reportException should not evaluate _javascript_ handling exceptions
// If this is a custom exception object, call toString on it to try and get a nice string representation for the exception.
String errorMessage;
Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (219765 => 219766)
--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2017-07-22 21:20:23 UTC (rev 219766)
@@ -80,7 +80,6 @@
#include "EventNames.cpp"
#include "EventPath.cpp"
#include "EventTarget.cpp"
-#include "ExceptionBase.cpp"
#include "ExceptionCodeDescription.cpp"
#include "ExtensionStyleSheets.cpp"
#include "FocusEvent.cpp"
Modified: trunk/Source/WebCore/dom/DOMException.cpp (219765 => 219766)
--- trunk/Source/WebCore/dom/DOMException.cpp 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/dom/DOMException.cpp 2017-07-22 21:20:23 UTC (rev 219766)
@@ -92,14 +92,21 @@
}
DOMException::DOMException(ExceptionCode ec, const String& message, const String& name)
- : ExceptionBase(ec, name, message, ASCIILiteral("DOM"))
+ : m_code(ec)
+ , m_name(name)
+ , m_message(message)
{
}
+DOMException::DOMException(const ExceptionCodeDescription& description)
+ : m_code(description.code)
+ , m_name(description.name)
+ , m_message(description.description)
+{
+}
+
bool DOMException::initializeDescription(ExceptionCode ec, ExceptionCodeDescription* description)
{
- description->typeName = "DOM";
-
size_t tableIndex = ec - INDEX_SIZE_ERR;
if (tableIndex < WTF_ARRAY_LENGTH(coreExceptions)) {
auto& exception = coreExceptions[tableIndex];
Modified: trunk/Source/WebCore/dom/DOMException.h (219765 => 219766)
--- trunk/Source/WebCore/dom/DOMException.h 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/dom/DOMException.h 2017-07-22 21:20:23 UTC (rev 219766)
@@ -28,12 +28,14 @@
#pragma once
-#include "ExceptionBase.h"
+#include <wtf/text/WTFString.h>
namespace WebCore {
-// FIXME: We should merge ExceptionBase into DOMException now that ExceptionBase no longer has any other subclasses.
-class DOMException : public ExceptionBase {
+struct ExceptionCodeDescription;
+using ExceptionCode = int;
+
+class DOMException : public RefCounted<DOMException> {
public:
static Ref<DOMException> create(const ExceptionCodeDescription& description)
{
@@ -43,12 +45,17 @@
static bool initializeDescription(ExceptionCode, ExceptionCodeDescription*);
+ ExceptionCode code() const { return m_code; }
+ String name() const { return m_name; }
+ String message() const { return m_message; }
+
protected:
DOMException(ExceptionCode, const String& message, const String& name);
- explicit DOMException(const ExceptionCodeDescription& description)
- : ExceptionBase(description)
- {
- }
+ explicit DOMException(const ExceptionCodeDescription&);
+
+ ExceptionCode m_code;
+ String m_name;
+ String m_message;
};
} // namespace WebCore
Deleted: trunk/Source/WebCore/dom/ExceptionBase.cpp (219765 => 219766)
--- trunk/Source/WebCore/dom/ExceptionBase.cpp 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/dom/ExceptionBase.cpp 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ExceptionBase.h"
-
-#include "ExceptionCodeDescription.h"
-
-namespace WebCore {
-
-ExceptionBase::ExceptionBase(const ExceptionCodeDescription& description)
- : m_code(description.code)
- , m_name(description.name)
- , m_message(description.description)
- , m_typeName(description.typeName)
-{
-}
-
-ExceptionBase::ExceptionBase(unsigned short code, const String& name, const String& message, const String& typeName)
- : m_code(code)
- , m_name(name)
- , m_message(message)
- , m_typeName(typeName)
-{
-}
-
-String ExceptionBase::toString() const
-{
- if (!m_toString.isEmpty())
- return m_toString;
-
- String lastComponent;
- if (!m_message.isEmpty())
- lastComponent = makeString(": ", m_message);
-
- if (m_name.isEmpty())
- m_toString = makeString(m_typeName, " Exception", m_code ? makeString(" ", String::number(m_code)) : "", lastComponent);
- else
- m_toString = makeString(m_name, " (", m_typeName, " Exception", m_code ? makeString(" ", String::number(m_code)) : "", ")", lastComponent);
-
- return m_toString;
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/dom/ExceptionBase.h (219765 => 219766)
--- trunk/Source/WebCore/dom/ExceptionBase.h 2017-07-22 19:57:12 UTC (rev 219765)
+++ trunk/Source/WebCore/dom/ExceptionBase.h 2017-07-22 21:20:23 UTC (rev 219766)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-struct ExceptionCodeDescription;
-
-using ExceptionCode = int;
-
-class ExceptionBase : public RefCounted<ExceptionBase> {
-public:
- unsigned short code() const { return m_code; }
- String name() const { return m_name; }
- String message() const { return m_message; }
-
- String toString() const;
-
-protected:
- explicit ExceptionBase(const ExceptionCodeDescription&);
- ExceptionBase(unsigned short code, const String& name, const String& message, const String& typeName);
-
-private:
- unsigned short m_code;
- String m_name;
- String m_message;
- String m_typeName;
- mutable String m_toString;
-};
-
-} // namespace WebCore