<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[202023] trunk</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202023">202023</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2016-06-13 20:28:10 -0700 (Mon, 13 Jun 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>window.onerror should pass the ErrorEvent's 'error' property as the 5th argument to the event handler

https://bugs.webkit.org/show_bug.cgi?id=55092

&lt;rdar://problem/25731279&gt;

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2016-06-13

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

* web-platform-tests/html/dom/interfaces-expected.txt:

Source/WebCore:

This includes the actual Error in window.error / ErrorEvent:

https://html.spec.whatwg.org/multipage/webappapis.html#the-errorevent-interface

This is useful for scripts to be able to get an error stack

from uncaught exceptions, by checking the error itself.

Tests: fast/events/window-onerror17.html

       http/tests/security/cross-origin-script-error-event-redirected.html

       http/tests/security/cross-origin-script-error-event.html

       http/tests/security/script-crossorigin-error-event-information.html

       http/tests/security/script-no-crossorigin-error-event-should-be-sanitized.html

       userscripts/window-onerror-for-isolated-world-3.html

* CMakeLists.txt:

* WebCore.xcodeproj/project.pbxproj:

* bindings/js/JSBindingsAllInOne.cpp:

Add new custom error event file.

* bindings/js/JSDOMBinding.cpp:

(WebCore::reportException):

Include the JSC::Exception when reporting exceptions, so the error value is available.

* bindings/js/JSErrorEventCustom.cpp:

(WebCore::JSErrorEvent::error):

Sanitized access to the ErrorEvent's error property to prevent leaking objects

across isolated world boundaries. This is like CustomEvent's data property.

* bindings/js/JSErrorHandler.cpp:

(WebCore::JSErrorHandler::handleEvent):

* bindings/js/JSErrorHandler.h:

Include the error object as the 4th argument to the window.onerror event handler.

* dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::sanitizeScriptError):

(WebCore::ScriptExecutionContext::reportException):

(WebCore::ScriptExecutionContext::dispatchErrorEvent):

* dom/ScriptExecutionContext.h:

Include the error object in the ErrorEvent constructed when dispatching error events.

* dom/ErrorEvent.cpp:

(WebCore::ErrorEvent::ErrorEvent):

(WebCore::ErrorEvent::sanitizedErrorValue):

(WebCore::ErrorEvent::trySerializeError):

* dom/ErrorEvent.h:

* dom/ErrorEvent.idl:

Include an any &quot;error&quot; property on the ErrorEvent, and allow it in initialization.

* bindings/js/WorkerScriptController.cpp:

(WebCore::WorkerScriptController::evaluate):

* workers/WorkerMessagingProxy.cpp:

(WebCore::WorkerMessagingProxy::postExceptionToWorkerObject):

Within the Worker world, the error is included in the event.

When re-dispatching the error on the world object in the world that spawned the

Worker the event does not include an error object. This matches other browsers

right now, but could be improved to have the same cross world serialization

as isolated worlds have with the error data.

* dom/CustomEvent.h:

Remove unimplemented stale method.

LayoutTests:

* platform/wk2/TestExpectations:

Skip new userscript test on WebKit2 like others.

* fast/events/constructors/error-event-constructor-expected.txt:

* fast/events/constructors/error-event-constructor.html:

Test for the new any &quot;error&quot; initialization property.

* fast/events/event-leak-objects-expected.txt:

* fast/events/event-leak-objects.html:

* fast/events/event-properties-gc-expected.txt:

* fast/events/event-properties-gc.html:

Like CustomEvent.details, ErrorEvent.error should not leak

objects across isolated worlds.

* fast/events/window-onerror-exception-in-attr-expected.txt:

* fast/events/window-onerror-exception-in-attr.html:

* fast/events/window-onerror-syntax-error-in-attr-expected.txt:

* fast/events/window-onerror-syntax-error-in-attr.html:

* fast/events/window-onerror1-expected.txt:

* fast/events/window-onerror1.html:

* fast/events/window-onerror10-expected.txt:

* fast/events/window-onerror10.html:

* fast/events/window-onerror11-expected.txt:

* fast/events/window-onerror11.html:

* fast/events/window-onerror12-expected.txt:

* fast/events/window-onerror12.html:

* fast/events/window-onerror13.html:

* fast/events/window-onerror14.html:

* fast/events/window-onerror16.html:

* fast/events/window-onerror17-expected.txt: Added.

* fast/events/window-onerror17.html: Copied from LayoutTests/fast/events/window-onerror12.html.

* fast/events/window-onerror2-expected.txt:

* fast/events/window-onerror2.html:

* fast/events/window-onerror3-expected.txt:

* fast/events/window-onerror3.html:

* fast/events/window-onerror4-expected.txt:

* fast/events/window-onerror4.html:

* fast/events/window-onerror5-expected.txt:

* fast/events/window-onerror5.html:

* fast/events/window-onerror6-expected.txt:

* fast/events/window-onerror6.html:

* fast/events/window-onerror7-expected.txt:

* fast/events/window-onerror7.html:

* fast/events/window-onerror8-expected.txt:

* fast/events/window-onerror8.html:

* fast/events/window-onerror9-expected.txt:

* fast/events/window-onerror9.html:

Include output for the column number and error object where possible.

* fast/files/resources/setup-for-read-common.js:

* fast/files/workers/worker-apply-blob-url-to-xhr.html:

* fast/workers/resources/worker-error-in-handling-script-error.js:

* fast/workers/resources/worker-script-error-bubbled.js:

* fast/workers/resources/worker-script-error-handled.js:

* fast/workers/resources/worker-script-error.js:

* fast/workers/worker-script-error-expected.txt:

Test &quot;onerror&quot; within Workers, and the &quot;error&quot; event on

the Worker from the spawning context.

* http/tests/security/cross-origin-script-error-event-expected.txt: Added.

* http/tests/security/cross-origin-script-error-event-redirected-expected.txt: Added.

* http/tests/security/cross-origin-script-error-event-redirected.html: Added.

* http/tests/security/cross-origin-script-error-event.html: Added.

* http/tests/security/cross-origin-script-window-onerror-expected.txt:

* http/tests/security/cross-origin-script-window-onerror-redirected-expected.txt:

* http/tests/security/cross-origin-script-window-onerror-redirected.html:

* http/tests/security/cross-origin-script-window-onerror.html:

* http/tests/security/script-crossorigin-error-event-information-expected.txt: Added.

* http/tests/security/script-crossorigin-error-event-information.html: Added.

* http/tests/security/script-crossorigin-onerror-information-expected.txt:

* http/tests/security/script-crossorigin-onerror-information.html:

* http/tests/security/script-no-crossorigin-error-event-should-be-sanitized-expected.txt: Added.

* http/tests/security/script-no-crossorigin-error-event-should-be-sanitized.html: Copied from LayoutTests/http/tests/security/script-no-crossorigin-onerror-should-be-sanitized.html.

* http/tests/security/script-no-crossorigin-onerror-should-be-sanitized-expected.txt:

* http/tests/security/script-no-crossorigin-onerror-should-be-sanitized.html:

* http/tests/security/window-onerror-exception-in-iframe-expected.txt:

* http/tests/security/window-onerror-exception-in-iframe.html:

* http/tests/workers/worker-importScriptsOnError-expected.txt:

* js/dom/exception-line-number-expected.txt:

* js/dom/script-tests/exception-line-number.js:

(window.onerror):

* userscripts/window-onerror-for-isolated-world-1-expected.txt:

* userscripts/window-onerror-for-isolated-world-1.html:

* userscripts/window-onerror-for-isolated-world-2-expected.txt:

* userscripts/window-onerror-for-isolated-world-2.html:

* userscripts/window-onerror-for-isolated-world-3-expected.txt: Added.

* userscripts/window-onerror-for-isolated-world-3.html: Added.

Add an explicit test for error objects crossing isolated world boundaries.

In the Isolated World case, serializable values are cloned, but unserializable

values cause the error object to return to null to avoid leaking across worlds.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsfasteventsconstructorserroreventconstructorexpectedtxt">trunk/LayoutTests/fast/events/constructors/error-event-constructor-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventsconstructorserroreventconstructorhtml">trunk/LayoutTests/fast/events/constructors/error-event-constructor.html</a></li>

<li><a href="#trunkLayoutTestsfasteventseventleakobjectsexpectedtxt">trunk/LayoutTests/fast/events/event-leak-objects-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventseventleakobjectshtml">trunk/LayoutTests/fast/events/event-leak-objects.html</a></li>

<li><a href="#trunkLayoutTestsfasteventseventpropertiesgcexpectedtxt">trunk/LayoutTests/fast/events/event-properties-gc-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventseventpropertiesgchtml">trunk/LayoutTests/fast/events/event-properties-gc.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerrorexceptioninattrexpectedtxt">trunk/LayoutTests/fast/events/window-onerror-exception-in-attr-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerrorexceptioninattrhtml">trunk/LayoutTests/fast/events/window-onerror-exception-in-attr.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerrorsyntaxerrorinattrexpectedtxt">trunk/LayoutTests/fast/events/window-onerror-syntax-error-in-attr-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerrorsyntaxerrorinattrhtml">trunk/LayoutTests/fast/events/window-onerror-syntax-error-in-attr.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror1expectedtxt">trunk/LayoutTests/fast/events/window-onerror1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror1html">trunk/LayoutTests/fast/events/window-onerror1.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror10expectedtxt">trunk/LayoutTests/fast/events/window-onerror10-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror10html">trunk/LayoutTests/fast/events/window-onerror10.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror11expectedtxt">trunk/LayoutTests/fast/events/window-onerror11-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror11html">trunk/LayoutTests/fast/events/window-onerror11.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror12expectedtxt">trunk/LayoutTests/fast/events/window-onerror12-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror12html">trunk/LayoutTests/fast/events/window-onerror12.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror13html">trunk/LayoutTests/fast/events/window-onerror13.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror14html">trunk/LayoutTests/fast/events/window-onerror14.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror16html">trunk/LayoutTests/fast/events/window-onerror16.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror2expectedtxt">trunk/LayoutTests/fast/events/window-onerror2-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror2html">trunk/LayoutTests/fast/events/window-onerror2.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror3expectedtxt">trunk/LayoutTests/fast/events/window-onerror3-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror3html">trunk/LayoutTests/fast/events/window-onerror3.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror4expectedtxt">trunk/LayoutTests/fast/events/window-onerror4-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror4html">trunk/LayoutTests/fast/events/window-onerror4.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror5expectedtxt">trunk/LayoutTests/fast/events/window-onerror5-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror5html">trunk/LayoutTests/fast/events/window-onerror5.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror6expectedtxt">trunk/LayoutTests/fast/events/window-onerror6-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror6html">trunk/LayoutTests/fast/events/window-onerror6.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror7expectedtxt">trunk/LayoutTests/fast/events/window-onerror7-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror7html">trunk/LayoutTests/fast/events/window-onerror7.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror8expectedtxt">trunk/LayoutTests/fast/events/window-onerror8-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror8html">trunk/LayoutTests/fast/events/window-onerror8.html</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror9expectedtxt">trunk/LayoutTests/fast/events/window-onerror9-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror9html">trunk/LayoutTests/fast/events/window-onerror9.html</a></li>

<li><a href="#trunkLayoutTestsfastfilesresourcessetupforreadcommonjs">trunk/LayoutTests/fast/files/resources/setup-for-read-common.js</a></li>

<li><a href="#trunkLayoutTestsfastfilesworkersworkerapplybloburltoxhrhtml">trunk/LayoutTests/fast/files/workers/worker-apply-blob-url-to-xhr.html</a></li>

<li><a href="#trunkLayoutTestsfastworkersresourcesworkererrorinhandlingscripterrorjs">trunk/LayoutTests/fast/workers/resources/worker-error-in-handling-script-error.js</a></li>

<li><a href="#trunkLayoutTestsfastworkersresourcesworkerscripterrorbubbledjs">trunk/LayoutTests/fast/workers/resources/worker-script-error-bubbled.js</a></li>

<li><a href="#trunkLayoutTestsfastworkersresourcesworkerscripterrorhandledjs">trunk/LayoutTests/fast/workers/resources/worker-script-error-handled.js</a></li>

<li><a href="#trunkLayoutTestsfastworkersworkerscripterrorexpectedtxt">trunk/LayoutTests/fast/workers/worker-script-error-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastworkersworkerscripterrorhtml">trunk/LayoutTests/fast/workers/worker-script-error.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscriptwindowonerrorexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-script-window-onerror-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscriptwindowonerrorredirectedexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-script-window-onerror-redirected-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscriptwindowonerrorredirectedhtml">trunk/LayoutTests/http/tests/security/cross-origin-script-window-onerror-redirected.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscriptwindowonerrorhtml">trunk/LayoutTests/http/tests/security/cross-origin-script-window-onerror.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptcrossoriginonerrorinformationexpectedtxt">trunk/LayoutTests/http/tests/security/script-crossorigin-onerror-information-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptcrossoriginonerrorinformationhtml">trunk/LayoutTests/http/tests/security/script-crossorigin-onerror-information.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptnocrossoriginonerrorshouldbesanitizedexpectedtxt">trunk/LayoutTests/http/tests/security/script-no-crossorigin-onerror-should-be-sanitized-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptnocrossoriginonerrorshouldbesanitizedhtml">trunk/LayoutTests/http/tests/security/script-no-crossorigin-onerror-should-be-sanitized.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritywindowonerrorexceptioniniframeexpectedtxt">trunk/LayoutTests/http/tests/security/window-onerror-exception-in-iframe-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritywindowonerrorexceptioniniframehtml">trunk/LayoutTests/http/tests/security/window-onerror-exception-in-iframe.html</a></li>

<li><a href="#trunkLayoutTestshttptestsworkersworkerimportScriptsOnErrorexpectedtxt">trunk/LayoutTests/http/tests/workers/worker-importScriptsOnError-expected.txt</a></li>

<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjsdomexceptionlinenumberexpectedtxt">trunk/LayoutTests/js/dom/exception-line-number-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjsdomscripttestsexceptionlinenumberjs">trunk/LayoutTests/js/dom/script-tests/exception-line-number.js</a></li>

<li><a href="#trunkLayoutTestsplatformwk2TestExpectations">trunk/LayoutTests/platform/wk2/TestExpectations</a></li>

<li><a href="#trunkLayoutTestsuserscriptswindowonerrorforisolatedworld1expectedtxt">trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsuserscriptswindowonerrorforisolatedworld1html">trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-1.html</a></li>

<li><a href="#trunkLayoutTestsuserscriptswindowonerrorforisolatedworld2expectedtxt">trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-2-expected.txt</a></li>

<li><a href="#trunkLayoutTestsuserscriptswindowonerrorforisolatedworld2html">trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-2.html</a></li>

<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>

<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>

<li><a href="#trunkSourceWebCorebindingsjsJSCustomEventCustomcpp">trunk/Source/WebCore/bindings/js/JSCustomEventCustom.cpp</a></li>

<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>

<li><a href="#trunkSourceWebCorebindingsjsJSErrorHandlercpp">trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp</a></li>

<li><a href="#trunkSourceWebCorebindingsjsJSErrorHandlerh">trunk/Source/WebCore/bindings/js/JSErrorHandler.h</a></li>

<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptControllercpp">trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp</a></li>

<li><a href="#trunkSourceWebCoredomCustomEventh">trunk/Source/WebCore/dom/CustomEvent.h</a></li>

<li><a href="#trunkSourceWebCoredomErrorEventcpp">trunk/Source/WebCore/dom/ErrorEvent.cpp</a></li>

<li><a href="#trunkSourceWebCoredomErrorEventh">trunk/Source/WebCore/dom/ErrorEvent.h</a></li>

<li><a href="#trunkSourceWebCoredomErrorEventidl">trunk/Source/WebCore/dom/ErrorEvent.idl</a></li>

<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>

<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>

<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsfasteventswindowonerror17expectedtxt">trunk/LayoutTests/fast/events/window-onerror17-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfasteventswindowonerror17html">trunk/LayoutTests/fast/events/window-onerror17.html</a></li>

<li><a href="#trunkLayoutTestsfastworkersresourcesworkerscripterrorjs">trunk/LayoutTests/fast/workers/resources/worker-script-error.js</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscripterroreventexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-script-error-event-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscripterroreventredirectedexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-script-error-event-redirected-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscripterroreventredirectedhtml">trunk/LayoutTests/http/tests/security/cross-origin-script-error-event-redirected.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginscripterroreventhtml">trunk/LayoutTests/http/tests/security/cross-origin-script-error-event.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptcrossoriginerroreventinformationexpectedtxt">trunk/LayoutTests/http/tests/security/script-crossorigin-error-event-information-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptcrossoriginerroreventinformationhtml">trunk/LayoutTests/http/tests/security/script-crossorigin-error-event-information.html</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptnocrossoriginerroreventshouldbesanitizedexpectedtxt">trunk/LayoutTests/http/tests/security/script-no-crossorigin-error-event-should-be-sanitized-expected.txt</a></li>

<li><a href="#trunkLayoutTestshttptestssecurityscriptnocrossoriginerroreventshouldbesanitizedhtml">trunk/LayoutTests/http/tests/security/script-no-crossorigin-error-event-should-be-sanitized.html</a></li>

<li><a href="#trunkLayoutTestsuserscriptswindowonerrorforisolatedworld3expectedtxt">trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-3-expected.txt</a></li>

<li><a href="#trunkLayoutTestsuserscriptswindowonerrorforisolatedworld3html">trunk/LayoutTests/userscripts/window-onerror-for-isolated-world-3.html</a></li>

<li><a href="#trunkSourceWebCorebindingsjsJSErrorEventCustomcpp">trunk/Source/WebCore/bindings/js/JSErrorEventCustom.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202022 => 202023)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2016-06-14 03:05:21 UTC (rev 202022)

+++ trunk/LayoutTests/ChangeLog        2016-06-14 03:28:10 UTC (rev 202023)

</span><span class="lines">@@ -1,3 +1,103 @@

</span><ins>+2016-06-13  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+        window.onerror should pass the ErrorEvent's 'error' property as the 5th argument to the event handler

+        https://bugs.webkit.org/show_bug.cgi?id=55092

+        &lt;rdar://problem/25731279&gt;

+

+        Reviewed by Dean Jackson.

+

+        * platform/wk2/TestExpectations:

+        Skip new userscript test on WebKit2 like others.

+

+        * fast/events/constructors/error-event-constructor-expected.txt:

+        * fast/events/constructors/error-event-constructor.html:

+        Test for the new any &quot;error&quot; initialization property.

+

+        * fast/events/event-leak-objects-expected.txt:

+        * fast/events/event-leak-objects.html:

+        * fast/events/event-properties-gc-expected.txt:

+        * fast/events/event-properties-gc.html:

+        Like CustomEvent.details, ErrorEvent.error should not leak

+        objects across isolated worlds.

+

+        * fast/events/window-onerror-exception-in-attr-expected.txt:

+        * fast/events/window-onerror-exception-in-attr.html:

+        * fast/events/window-onerror-syntax-error-in-attr-expected.txt:

+        * fast/events/window-onerror-syntax-error-in-attr.html:

+        * fast/events/window-onerror1-expected.txt:

+        * fast/events/window-onerror1.html:

+        * fast/events/window-onerror10-expected.txt:

+        * fast/events/window-onerror10.html:

+        * fast/events/window-onerror11-expected.txt:

+        * fast/events/window-onerror11.html:

+        * fast/events/window-onerror12-expected.txt:

+        * fast/events/window-onerror12.html:

+        * fast/events/window-onerror13.html:

+        * fast/events/window-onerror14.html:

+        * fast/events/window-onerror16.html:

+        * fast/events/window-onerror17-expected.txt: Added.

+        * fast/events/window-onerror17.html: Copied from LayoutTests/fast/events/window-onerror12.html.

+        * fast/events/window-onerror2-expected.txt:

+        * fast/events/window-onerror2.html:

+        * fast/events/window-onerror3-expected.txt:

+        * fast/events/window-onerror3.html:

+        * fast/events/window-onerror4-expected.txt:

+        * fast/events/window-onerror4.html:

+        * fast/events/window-onerror5-expected.txt:

+        * fast/events/window-onerror5.html:

+        * fast/events/window-onerror6-expected.txt:

+        * fast/events/window-onerror6.html:

+        * fast/events/window-onerror7-expected.txt:

+        * fast/events/window-onerror7.html:

+        * fast/events/window-onerror8-expected.txt:

+        * fast/events/window-onerror8.html:

+        * fast/events/window-onerror9-expected.txt:

+        * fast/events/window-onerror9.html:

+        Include output for the column number and error object where possible.

+

+        * fast/files/resources/setup-for-read-common.js:

+        * fast/files/workers/worker-apply-blob-url-to-xhr.html:

+        * fast/workers/resources/worker-error-in-handling-script-error.js:

+        * fast/workers/resources/worker-script-error-bubbled.js:

+        * fast/workers/resources/worker-script-error-handled.js:

+        * fast/workers/resources/worker-script-error.js:

+        * fast/workers/worker-script-error-expected.txt:

+        Test &quot;onerror&quot; within Workers, and the &quot;error&quot; event on

+        the Worker from the spawning context.

+

+        * http/tests/security/cross-origin-script-error-event-expected.txt: Added.

+        * http/tests/security/cross-origin-script-error-event-redirected-expected.txt: Added.

+        * http/tests/security/cross-origin-script-error-event-redirected.html: Added.

+        * http/tests/security/cross-origin-script-error-event.html: Added.

+        * http/tests/security/cross-origin-script-window-onerror-expected.txt:

+        * http/tests/security/cross-origin-script-window-onerror-redirected-expected.txt:

+        * http/tests/security/cross-origin-script-window-onerror-redirected.html:

+        * http/tests/security/cross-origin-script-window-onerror.html:

+        * http/tests/security/script-crossorigin-error-event-information-expected.txt: Added.

+        * http/tests/security/script-crossorigin-error-event-information.html: Added.

+        * http/tests/security/script-crossorigin-onerror-information-expected.txt:

+        * http/tests/security/script-crossorigin-onerror-information.html:

+        * http/tests/security/script-no-crossorigin-error-event-should-be-sanitized-expected.txt: Added.

+        * http/tests/security/script-no-crossorigin-error-event-should-be-sanitized.html: Copied from LayoutTests/http/tests/security/script-no-crossorigin-onerror-should-be-sanitized.html.

+        * http/tests/security/script-no-crossorigin-onerror-should-be-sanitized-expected.txt:

+        * http/tests/security/script-no-crossorigin-onerror-should-be-sanitized.html:

+        * http/tests/security/window-onerror-exception-in-iframe-expected.txt:

+        * http/tests/security/window-onerror-exception-in-iframe.html:

+        * http/tests/workers/worker-importScriptsOnError-expected.txt:

+        * js/dom/exception-line-number-expected.txt:

+        * js/dom/script-tests/exception-line-number.js:

+        (window.onerror):

+

+        * userscripts/window-onerror-for-isolated-world-1-expected.txt:

+        * userscripts/window-onerror-for-isolated-world-1.html:

+        * userscripts/window-onerror-for-isolated-world-2-expected.txt:

+        * userscripts/window-onerror-for-isolated-world-2.html:

+        * userscripts/window-onerror-for-isolated-world-3-expected.txt: Added.

+        * userscripts/window-onerror-for-isolated-world-3.html: Added.

+        Add an explicit test for error objects crossing isolated world boundaries.

+        In the Isolated World case, serializable values are cloned, but unserializable

+        values cause the error object to return to null to avoid leaking across worlds.

+

</ins><span class="cx"> 2016-06-13  Dean Jackson  &lt;dino@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         SVG elements don't blend correctly into HTML

</span></span></pre></div>

<a id="trunkLayoutTestsfasteventsconstructorserroreventconstructorexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/constructors/error-event-constructor-expected.txt (202022 => 202023)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/events/constructors/error-event-constructor-expected.txt        2016-06-14 03:05:21 UTC (rev 202022)

+++ trunk/LayoutTests/fast/events/constructors/error-event-constructor-expected.txt        2016-06-14 03:28:10 UTC (rev 202023)

</span><span class="lines">@@ -64,6 +64,14 @@

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: 1 }).colno is 1

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: 4294967294 }).colno is 4294967294

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: 4294967295 }).colno is 4294967295

</span><ins>+PASS new ErrorEvent('eventType', { error: undefined }).error is undefined

+PASS new ErrorEvent('eventType', { error: null }).error is null

+PASS new ErrorEvent('eventType', { error: '' }).error is ''

+PASS new ErrorEvent('eventType', { error: '12345' }).error is '12345'

+PASS new ErrorEvent('eventType', { error: [] }).error is []

+PASS new ErrorEvent('eventType', { error: [12345] }).error is [12345]

+PASS new ErrorEvent('eventType', { error: [12345, 67890] }).error is [12345, 67890]

+PASS new ErrorEvent('eventType', { error: {moemoe: 12345} }).error.moemoe is 12345

</ins><span class="cx"> PASS new ErrorEvent('eventType', { colno: 9007199254740991 }).colno is 4294967295

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: 18446744073709551615 }).colno is 0

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: 12345678901234567890 }).colno is 3944679424

</span><span class="lines">@@ -82,12 +90,13 @@

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: {} }).colno is 0

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: {moemoe: 12345} }).colno is 0

</span><span class="cx"> PASS new ErrorEvent('eventType', { colno: {valueOf: function () { return 12345; }} }).colno is 12345

</span><del>-PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).bubbles is true

-PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).cancelable is true

-PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).message is &quot;sakuranbo&quot;

-PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).filename is &quot;amaenbo&quot;

-PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).lineno is 12345

-PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).colno is 23456

</del><ins>+PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).bubbles is true

+PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).cancelable is true

+PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).message is &quot;sakuranbo&quot;

+PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).filename is &quot;amaenbo&quot;

+PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).lineno is 12345

+PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).colno is 23456

+PASS new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).error is 42

</ins><span class="cx"> PASS successfullyParsed is true

</span><span class="cx"> 

</span><span class="cx"> TEST COMPLETE

</span></span></pre></div>

<a id="trunkLayoutTestsfasteventsconstructorserroreventconstructorhtml"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/constructors/error-event-constructor.html (202022 => 202023)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/events/constructors/error-event-constructor.html        2016-06-14 03:05:21 UTC (rev 202022)

+++ trunk/LayoutTests/fast/events/constructors/error-event-constructor.html        2016-06-14 03:28:10 UTC (rev 202023)

</span><span class="lines">@@ -81,6 +81,16 @@

</span><span class="cx"> shouldBe(&quot;new ErrorEvent('eventType', { colno: 4294967294 }).colno&quot;, &quot;4294967294&quot;);

</span><span class="cx"> shouldBe(&quot;new ErrorEvent('eventType', { colno: 4294967295 }).colno&quot;, &quot;4294967295&quot;);

</span><span class="cx"> 

<ins>+// error is passed.

+shouldBe(&quot;new ErrorEvent('eventType', { error: undefined }).error&quot;, &quot;undefined&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { error: null }).error&quot;, &quot;null&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { error: '' }).error&quot;, &quot;''&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { error: '12345' }).error&quot;, &quot;'12345'&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { error: [] }).error&quot;, &quot;[]&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { error: [12345] }).error&quot;, &quot;[12345]&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { error: [12345, 67890] }).error&quot;, &quot;[12345, 67890]&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { error: {moemoe: 12345} }).error.moemoe&quot;, &quot;12345&quot;);

+

</ins><span class="cx"> // numbers out of the unsigned long range.

<span class="cx"> // 2^{53}-1, the largest number that can be exactly represented by double.

</span><span class="cx"> shouldBe(&quot;new ErrorEvent('eventType', { colno: 9007199254740991 }).colno&quot;, &quot;4294967295&quot;);

</span><span class="lines">@@ -106,12 +116,13 @@

</span><span class="cx"> shouldBe(&quot;new ErrorEvent('eventType', { colno: {valueOf: function () { return 12345; }} }).colno&quot;, &quot;12345&quot;);

</span><span class="cx"> 

<span class="cx"> // All initializers are passed.

</span><del>-shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).bubbles&quot;, &quot;true&quot;);

-shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).cancelable&quot;, &quot;true&quot;);

-shouldBeEqualToString(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).message&quot;, &quot;sakuranbo&quot;);

-shouldBeEqualToString(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).filename&quot;, &quot;amaenbo&quot;);

-shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).lineno&quot;, &quot;12345&quot;);

-shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456 }).colno&quot;, &quot;23456&quot;);

</del><ins>+shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).bubbles&quot;, &quot;true&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).cancelable&quot;, &quot;true&quot;);

+shouldBeEqualToString(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).message&quot;, &quot;sakuranbo&quot;);

+shouldBeEqualToString(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).filename&quot;, &quot;amaenbo&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).lineno&quot;, &quot;12345&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).colno&quot;, &quot;23456&quot;);

+shouldBe(&quot;new ErrorEvent('eventType', { bubbles: true, cancelable: true, message: 'sakuranbo', filename: 'amaenbo', lineno: 12345, colno: 23456, error: 42 }).error&quot;, &quot;42&quot;);

</ins><span class="cx"> &lt;/script&gt;

</span><span class="cx"> &lt;script src=&quot;../../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;

</span><span class="cx"> &lt;/body&gt;

</span></span></pre></div>

<a id="trunkLayoutTestsfasteventseventleakobjectsexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/event-leak-objects-expected.txt (202022 => 202023)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/events/event-leak-objects-expected.txt        2016-06-14 03:05:21 UTC (rev 202022)

+++ trunk/LayoutTests/fast/events/event-leak-objects-expected.txt        2016-06-14 03:28:10 UTC (rev 202023)

</span><span class="lines">@@ -1,3 +1,5 @@

</span><ins>+

+Testing ErrorEvent.error

</ins><span class="cx"> PASS window.internals.isFromCurrentWorld(event) is true

</span><span class="cx"> PASS checkAllPropertiesFromCurrentWorld(resultValue) is true