<!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>[210081] trunk/Source/WebCore</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/210081">210081</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-12-21 15:33:37 -0800 (Wed, 21 Dec 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WebIDL] Remove custom binding for ErrorEvent
https://bugs.webkit.org/show_bug.cgi?id=166345

Reviewed by Anders Carlsson.

* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSBindingsAllInOne.cpp:
* bindings/js/JSErrorEventCustom.cpp: Removed.
Remove JSErrorEventCustom.cpp

* ForwardingHeaders/heap/HandleTypes.h: Added.
Add forwarding header for HandleTypes.h

* bindings/js/JSErrorHandler.cpp:
(WebCore::JSErrorHandler::handleEvent):
Switch to using JSDOMConvert and call the updated name for the error getter.

* bindings/js/ScriptController.h:
* bindings/js/SerializedScriptValue.h:
Remove unnecessary forward declaration of ScriptValue.

* bindings/js/WorkerScriptController.cpp:
(WebCore::WorkerScriptController::evaluate):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::sanitizeScriptError):
(WebCore::ScriptExecutionContext::dispatchErrorEvent):
* dom/ScriptExecutionContext.h:
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::postExceptionToWorkerObject):
Update type that sanitizeScriptError takes from a ScriptValue to a Strong&lt;Unknown&gt;.

* bindings/scripts/CodeGeneratorJS.pm:
(GenerateCallWith):
* bindings/scripts/IDLAttributes.txt:
Add a new extended attributes option for the CallWith, GlobalObject, that passes the global object.

* dom/ErrorEvent.cpp:
(WebCore::ErrorEvent::ErrorEvent):
(WebCore::ErrorEvent::error):
(WebCore::ErrorEvent::trySerializeError):
(WebCore::ErrorEvent::sanitizedErrorValue): Deleted.
* dom/ErrorEvent.h:
Store a Strong&lt;Unknown&gt; directly, rather than a ScriptValue. Rename sanitizedErrorValue to 
just error to match the IDL.

* dom/ErrorEvent.idl:
Remove CustomGetter.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</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="#trunkSourceWebCorebindingsjsJSErrorHandlercpp">trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllerh">trunk/Source/WebCore/bindings/js/ScriptController.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValueh">trunk/Source/WebCore/bindings/js/SerializedScriptValue.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptControllercpp">trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsIDLAttributestxt">trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt</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="#trunkSourceWebCoreForwardingHeadersheapHandleTypesh">trunk/Source/WebCore/ForwardingHeaders/heap/HandleTypes.h</a></li>
</ul>

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

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/CMakeLists.txt        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -1120,7 +1120,6 @@
</span><span class="cx">     bindings/js/JSDocumentCustom.cpp
</span><span class="cx">     bindings/js/JSDocumentFragmentCustom.cpp
</span><span class="cx">     bindings/js/JSElementCustom.cpp
</span><del>-    bindings/js/JSErrorEventCustom.cpp
</del><span class="cx">     bindings/js/JSErrorHandler.cpp
</span><span class="cx">     bindings/js/JSEventCustom.cpp
</span><span class="cx">     bindings/js/JSEventListener.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/ChangeLog        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2016-12-21  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        [WebIDL] Remove custom binding for ErrorEvent
+        https://bugs.webkit.org/show_bug.cgi?id=166345
+
+        Reviewed by Anders Carlsson.
+
+        * CMakeLists.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSBindingsAllInOne.cpp:
+        * bindings/js/JSErrorEventCustom.cpp: Removed.
+        Remove JSErrorEventCustom.cpp
+
+        * ForwardingHeaders/heap/HandleTypes.h: Added.
+        Add forwarding header for HandleTypes.h
+
+        * bindings/js/JSErrorHandler.cpp:
+        (WebCore::JSErrorHandler::handleEvent):
+        Switch to using JSDOMConvert and call the updated name for the error getter.
+
+        * bindings/js/ScriptController.h:
+        * bindings/js/SerializedScriptValue.h:
+        Remove unnecessary forward declaration of ScriptValue.
+
+        * bindings/js/WorkerScriptController.cpp:
+        (WebCore::WorkerScriptController::evaluate):
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::sanitizeScriptError):
+        (WebCore::ScriptExecutionContext::dispatchErrorEvent):
+        * dom/ScriptExecutionContext.h:
+        * workers/WorkerMessagingProxy.cpp:
+        (WebCore::WorkerMessagingProxy::postExceptionToWorkerObject):
+        Update type that sanitizeScriptError takes from a ScriptValue to a Strong&lt;Unknown&gt;.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateCallWith):
+        * bindings/scripts/IDLAttributes.txt:
+        Add a new extended attributes option for the CallWith, GlobalObject, that passes the global object.
+
+        * dom/ErrorEvent.cpp:
+        (WebCore::ErrorEvent::ErrorEvent):
+        (WebCore::ErrorEvent::error):
+        (WebCore::ErrorEvent::trySerializeError):
+        (WebCore::ErrorEvent::sanitizedErrorValue): Deleted.
+        * dom/ErrorEvent.h:
+        Store a Strong&lt;Unknown&gt; directly, rather than a ScriptValue. Rename sanitizedErrorValue to 
+        just error to match the IDL.
+
+        * dom/ErrorEvent.idl:
+        Remove CustomGetter.
+
</ins><span class="cx"> 2016-12-21  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Modernize findPlainText
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersheapHandleTypesh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/heap/HandleTypes.h (0 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/heap/HandleTypes.h                                (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/heap/HandleTypes.h        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+#pragma once
+#include &lt;JavaScriptCore/HandleTypes.h&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include &quot;SerializedScriptValue.h&quot;
</span><span class="cx"> #include &quot;UniqueIDBDatabaseConnection.h&quot;
</span><span class="cx"> #include &lt;heap/HeapInlines.h&gt;
</span><ins>+#include &lt;heap/StrongInlines.h&gt;
</ins><span class="cx"> #include &lt;runtime/AuxiliaryBarrierInlines.h&gt;
</span><span class="cx"> #include &lt;runtime/StructureInlines.h&gt;
</span><span class="cx"> #include &lt;wtf/MainThread.h&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -4008,7 +4008,6 @@
</span><span class="cx">                 A55639D21C6F09E700806D8E /* WorkerConsoleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A55639CF1C6EFD5900806D8E /* WorkerConsoleClient.cpp */; };
</span><span class="cx">                 A56C5B9A189F34570082D13C /* WebConsoleAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A56C5B98189F34570082D13C /* WebConsoleAgent.cpp */; };
</span><span class="cx">                 A56C5B9B189F34570082D13C /* WebConsoleAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A56C5B99189F34570082D13C /* WebConsoleAgent.h */; };
</span><del>-                A56D02A31D0BAD680095E5D3 /* JSErrorEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A56D02A21D0B9AF30095E5D3 /* JSErrorEventCustom.cpp */; };
</del><span class="cx">                 A5732B0A136A161D005C8D7C /* DateComponents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5732B08136A161D005C8D7C /* DateComponents.cpp */; };
</span><span class="cx">                 A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 A57FD71B1DB9423E006AE24B /* WorkerRuntimeAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57FD7191DB94236006AE24B /* WorkerRuntimeAgent.cpp */; };
</span><span class="lines">@@ -11686,7 +11685,6 @@
</span><span class="cx">                 A55639D01C6EFD5900806D8E /* WorkerConsoleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerConsoleClient.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 A56C5B98189F34570082D13C /* WebConsoleAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebConsoleAgent.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 A56C5B99189F34570082D13C /* WebConsoleAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebConsoleAgent.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                A56D02A21D0B9AF30095E5D3 /* JSErrorEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSErrorEventCustom.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 A5732B08136A161D005C8D7C /* DateComponents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateComponents.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 A5732B09136A161D005C8D7C /* DateComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateComponents.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 A57FD7191DB94236006AE24B /* WorkerRuntimeAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerRuntimeAgent.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -22106,7 +22104,6 @@
</span><span class="cx">                                 BC64649B11D8238C006455B0 /* JSDOMStringMapCustom.cpp */,
</span><span class="cx">                                 BCD9C25E0C17AA67005C90A2 /* JSDOMWindowCustom.cpp */,
</span><span class="cx">                                 652FBBBB0DE27CB60001D386 /* JSDOMWindowCustom.h */,
</span><del>-                                A56D02A21D0B9AF30095E5D3 /* JSErrorEventCustom.cpp */,
</del><span class="cx">                                 2E7582ED12764F260062628B /* JSFileReaderCustom.cpp */,
</span><span class="cx">                                 C28083411C6DC96A001451B6 /* JSFontFaceCustom.cpp */,
</span><span class="cx">                                 1C24EEAA1C72AA0A0080F8FC /* JSFontFaceSetCustom.cpp */,
</span><span class="lines">@@ -29925,7 +29922,6 @@
</span><span class="cx">                                 65DF31F909D1CC60000BE325 /* JSElement.cpp in Sources */,
</span><span class="cx">                                 BC2ED5550C6B9BD300920BFF /* JSElementCustom.cpp in Sources */,
</span><span class="cx">                                 2ECF7ADC10162B3800427DE7 /* JSErrorEvent.cpp in Sources */,
</span><del>-                                A56D02A31D0BAD680095E5D3 /* JSErrorEventCustom.cpp in Sources */,
</del><span class="cx">                                 F3D461481161D53200CA0D09 /* JSErrorHandler.cpp in Sources */,
</span><span class="cx">                                 14E8378409F85D1C00B85AE4 /* JSEvent.cpp in Sources */,
</span><span class="cx">                                 BCEFAF4E0C317E6900FA81F6 /* JSEventCustom.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> #include &quot;JSDocumentCustom.cpp&quot;
</span><span class="cx"> #include &quot;JSDocumentFragmentCustom.cpp&quot;
</span><span class="cx"> #include &quot;JSElementCustom.cpp&quot;
</span><del>-#include &quot;JSErrorEventCustom.cpp&quot;
</del><span class="cx"> #include &quot;JSErrorHandler.cpp&quot;
</span><span class="cx"> #include &quot;JSEventCustom.cpp&quot;
</span><span class="cx"> #include &quot;JSEventListener.cpp&quot;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSErrorEventCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSErrorEventCustom.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSErrorEventCustom.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/js/JSErrorEventCustom.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 INC. OR
- * 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 &quot;config.h&quot;
-#include &quot;JSErrorEvent.h&quot;
-
-#include &quot;ErrorEvent.h&quot;
-#include &lt;heap/HeapInlines.h&gt;
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue JSErrorEvent::error(ExecState&amp; state) const
-{
-    return wrapped().sanitizedErrorValue(state, *globalObject());
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSErrorHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include &quot;ErrorEvent.h&quot;
</span><span class="cx"> #include &quot;Event.h&quot;
</span><span class="cx"> #include &quot;EventNames.h&quot;
</span><ins>+#include &quot;JSDOMConvert.h&quot;
</ins><span class="cx"> #include &quot;JSEvent.h&quot;
</span><span class="cx"> #include &quot;JSMainThreadExecState.h&quot;
</span><span class="cx"> #include &quot;JSMainThreadExecStateInstrumentation.h&quot;
</span><span class="lines">@@ -90,11 +91,11 @@
</span><span class="cx">         globalObject-&gt;setCurrentEvent(event);
</span><span class="cx"> 
</span><span class="cx">         MarkedArgumentBuffer args;
</span><del>-        args.append(jsStringWithCache(exec, errorEvent.message()));
-        args.append(jsStringWithCache(exec, errorEvent.filename()));
-        args.append(jsNumber(errorEvent.lineno()));
-        args.append(jsNumber(errorEvent.colno()));
-        args.append(errorEvent.sanitizedErrorValue(*exec, *globalObject));
</del><ins>+        args.append(toJS&lt;IDLDOMString&gt;(*exec, errorEvent.message()));
+        args.append(toJS&lt;IDLUSVString&gt;(*exec, errorEvent.filename()));
+        args.append(toJS&lt;IDLUnsignedLong&gt;(errorEvent.lineno()));
+        args.append(toJS&lt;IDLUnsignedLong&gt;(errorEvent.colno()));
+        args.append(errorEvent.error(*exec, *globalObject));
</ins><span class="cx"> 
</span><span class="cx">         VM&amp; vm = globalObject-&gt;vm();
</span><span class="cx">         VMEntryScope entryScope(vm, vm.entryScope ? vm.entryScope-&gt;globalObject() : globalObject);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.h (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.h        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/js/ScriptController.h        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -37,10 +37,6 @@
</span><span class="cx"> 
</span><span class="cx"> struct NPObject;
</span><span class="cx"> 
</span><del>-namespace Deprecated {
-class ScriptValue;
-}
-
</del><span class="cx"> namespace JSC {
</span><span class="cx"> class ExecState;
</span><span class="cx"> class JSGlobalObject;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include &quot;ExceptionOr.h&quot;
</span><del>-#include &lt;bindings/ScriptValue.h&gt;
</del><span class="cx"> #include &lt;heap/Strong.h&gt;
</span><span class="cx"> #include &lt;runtime/ArrayBuffer.h&gt;
</span><span class="cx"> #include &lt;runtime/JSCJSValue.h&gt;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">         int lineNumber = 0;
</span><span class="cx">         int columnNumber = 0;
</span><span class="cx">         String sourceURL = sourceCode.url().string();
</span><del>-        Deprecated::ScriptValue error;
</del><ins>+        JSC::Strong&lt;JSC::Unknown&gt; error;
</ins><span class="cx">         if (m_workerGlobalScope-&gt;sanitizeScriptError(errorMessage, lineNumber, columnNumber, sourceURL, error, sourceCode.cachedScript()))
</span><span class="cx">             returnedException = JSC::Exception::create(vm, createError(exec, errorMessage.impl()));
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -4254,17 +4254,13 @@
</span><span class="cx"> 
</span><span class="cx"> sub GenerateCallWith
</span><span class="cx"> {
</span><del>-    my $callWith = shift;
</del><ins>+    my ($callWith, $outputArray, $returnValue, $function, $statePointer, $stateReference, $globalObject) = @_;
+
</ins><span class="cx">     return () unless $callWith;
</span><del>-    my $outputArray = shift;
-    my $returnValue = shift;
-    my $function = shift;
-    my $statePointer = shift;
-    my $stateReference = shift;
-    my $globalObject = shift;
</del><span class="cx"> 
</span><span class="cx">     my @callWithArgs;
</span><span class="cx">     push(@callWithArgs, $stateReference) if $codeGenerator-&gt;ExtendedAttributeContains($callWith, &quot;ScriptState&quot;);
</span><ins>+    push(@callWithArgs, &quot;*${globalObject}&quot;) if $codeGenerator-&gt;ExtendedAttributeContains($callWith, &quot;GlobalObject&quot;);
</ins><span class="cx">     if ($codeGenerator-&gt;ExtendedAttributeContains($callWith, &quot;ScriptExecutionContext&quot;)) {
</span><span class="cx">         push(@$outputArray, &quot;    auto* context = $globalObject-&gt;scriptExecutionContext();\n&quot;);
</span><span class="cx">         push(@$outputArray, &quot;    if (!context)\n&quot;);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLAttributestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> CEReactions
</span><span class="cx"> CachedAttribute
</span><span class="cx"> CallbackNeedsOperatorEqual
</span><del>-CallWith=Document|ScriptExecutionContext|ScriptState|ScriptArguments|CallStack|ActiveWindow|FirstWindow|CallerDocument|CallerWindow
</del><ins>+CallWith=Document|ScriptExecutionContext|ScriptState|ScriptArguments|CallStack|GlobalObject|ActiveWindow|FirstWindow|CallerDocument|CallerWindow
</ins><span class="cx"> CheckSecurity
</span><span class="cx"> CheckSecurityForNode
</span><span class="cx"> Clamp
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> ReportExtraMemoryCost
</span><span class="cx"> ReportExternalMemoryCost
</span><span class="cx"> RequiresExistingAtomicString
</span><del>-SetterCallWith=ScriptExecutionContext|ScriptState|ScriptArguments|CallStack|ActiveWindow|FirstWindow
</del><ins>+SetterCallWith=ScriptExecutionContext|ScriptState|ScriptArguments|CallStack|GlobalObject|ActiveWindow|FirstWindow
</ins><span class="cx"> SetterMayThrowException
</span><span class="cx"> SkipVTableValidation
</span><span class="cx"> SuppressToJSObject
</span></span></pre></div>
<a id="trunkSourceWebCoredomErrorEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ErrorEvent.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ErrorEvent.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/dom/ErrorEvent.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include &quot;DOMWrapperWorld.h&quot;
</span><span class="cx"> #include &quot;EventNames.h&quot;
</span><span class="cx"> #include &lt;heap/HeapInlines.h&gt;
</span><ins>+#include &lt;heap/StrongInlines.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> using namespace JSC;
</span><span class="cx"> 
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ErrorEvent::ErrorEvent(const String&amp; message, const String&amp; fileName, unsigned lineNumber, unsigned columnNumber, const Deprecated::ScriptValue&amp; error)
</del><ins>+ErrorEvent::ErrorEvent(const String&amp; message, const String&amp; fileName, unsigned lineNumber, unsigned columnNumber, JSC::Strong&lt;JSC::Unknown&gt; error)
</ins><span class="cx">     : Event(eventNames().errorEvent, false, true)
</span><span class="cx">     , m_message(message)
</span><span class="cx">     , m_fileName(fileName)
</span><span class="lines">@@ -69,9 +70,9 @@
</span><span class="cx">     return ErrorEventInterfaceType;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSValue ErrorEvent::sanitizedErrorValue(ExecState&amp; exec, JSGlobalObject&amp; globalObject)
</del><ins>+JSValue ErrorEvent::error(ExecState&amp; exec, JSGlobalObject&amp; globalObject)
</ins><span class="cx"> {    
</span><del>-    auto error = m_error.jsValue();
</del><ins>+    auto error = m_error.get();
</ins><span class="cx">     if (!error)
</span><span class="cx">         return jsNull();
</span><span class="cx"> 
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> RefPtr&lt;SerializedScriptValue&gt; ErrorEvent::trySerializeError(ExecState&amp; exec)
</span><span class="cx"> {
</span><span class="cx">     if (!m_triedToSerialize) {
</span><del>-        m_serializedDetail = SerializedScriptValue::create(exec, m_error, NonThrowing);
</del><ins>+        m_serializedDetail = SerializedScriptValue::create(exec, m_error.get(), NonThrowing);
</ins><span class="cx">         m_triedToSerialize = true;
</span><span class="cx">     }
</span><span class="cx">     return m_serializedDetail;
</span></span></pre></div>
<a id="trunkSourceWebCoredomErrorEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ErrorEvent.h (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ErrorEvent.h        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/dom/ErrorEvent.h        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Event.h&quot;
</span><span class="cx"> #include &quot;SerializedScriptValue.h&quot;
</span><del>-#include &lt;bindings/ScriptValue.h&gt;
</del><ins>+#include &lt;heap/Strong.h&gt;
</ins><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> 
</span><span class="cx"> class ErrorEvent final : public Event {
</span><span class="cx"> public:
</span><del>-    static Ref&lt;ErrorEvent&gt; create(const String&amp; message, const String&amp; fileName, unsigned lineNumber, unsigned columnNumber, const Deprecated::ScriptValue&amp; error)
</del><ins>+    static Ref&lt;ErrorEvent&gt; create(const String&amp; message, const String&amp; fileName, unsigned lineNumber, unsigned columnNumber, JSC::Strong&lt;JSC::Unknown&gt; error)
</ins><span class="cx">     {
</span><span class="cx">         return adoptRef(*new ErrorEvent(message, fileName, lineNumber, columnNumber, error));
</span><span class="cx">     }
</span><span class="lines">@@ -64,13 +64,12 @@
</span><span class="cx">     const String&amp; filename() const { return m_fileName; }
</span><span class="cx">     unsigned lineno() const { return m_lineNumber; }
</span><span class="cx">     unsigned colno() const { return m_columnNumber; }
</span><del>-    const Deprecated::ScriptValue&amp; error() const { return m_error; }
-    JSC::JSValue sanitizedErrorValue(JSC::ExecState&amp;, JSC::JSGlobalObject&amp;);
</del><ins>+    JSC::JSValue error(JSC::ExecState&amp;, JSC::JSGlobalObject&amp;);
</ins><span class="cx"> 
</span><span class="cx">     EventInterface eventInterface() const override;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    ErrorEvent(const String&amp; message, const String&amp; fileName, unsigned lineNumber, unsigned columnNumber, const Deprecated::ScriptValue&amp; error);
</del><ins>+    ErrorEvent(const String&amp; message, const String&amp; fileName, unsigned lineNumber, unsigned columnNumber, JSC::Strong&lt;JSC::Unknown&gt; error);
</ins><span class="cx">     ErrorEvent(JSC::ExecState&amp;, const AtomicString&amp;, const Init&amp;, IsTrusted);
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;SerializedScriptValue&gt; trySerializeError(JSC::ExecState&amp;);
</span><span class="lines">@@ -81,7 +80,7 @@
</span><span class="cx">     String m_fileName;
</span><span class="cx">     unsigned m_lineNumber;
</span><span class="cx">     unsigned m_columnNumber;
</span><del>-    Deprecated::ScriptValue m_error;
</del><ins>+    JSC::Strong&lt;JSC::Unknown&gt; m_error;
</ins><span class="cx">     RefPtr&lt;SerializedScriptValue&gt; m_serializedDetail;
</span><span class="cx">     bool m_triedToSerialize { false };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomErrorEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ErrorEvent.idl (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ErrorEvent.idl        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/dom/ErrorEvent.idl        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">     readonly attribute USVString filename;
</span><span class="cx">     readonly attribute unsigned long lineno;
</span><span class="cx">     readonly attribute unsigned long colno;
</span><del>-    [CustomGetter] readonly attribute any error;
</del><ins>+    [CallWith=ScriptState&amp;GlobalObject] readonly attribute any error;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> dictionary ErrorEventInit : EventInit {
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include &quot;DatabaseContext.h&quot;
</span><span class="cx"> #include &quot;Document.h&quot;
</span><span class="cx"> #include &quot;ErrorEvent.h&quot;
</span><ins>+#include &quot;JSDOMWindow.h&quot;
</ins><span class="cx"> #include &quot;MessagePort.h&quot;
</span><span class="cx"> #include &quot;NoEventDispatchAssertion.h&quot;
</span><span class="cx"> #include &quot;PublicURLManager.h&quot;
</span><span class="lines">@@ -42,18 +43,12 @@
</span><span class="cx"> #include &quot;Settings.h&quot;
</span><span class="cx"> #include &quot;WorkerGlobalScope.h&quot;
</span><span class="cx"> #include &quot;WorkerThread.h&quot;
</span><ins>+#include &lt;heap/StrongInlines.h&gt;
</ins><span class="cx"> #include &lt;inspector/ScriptCallStack.h&gt;
</span><span class="cx"> #include &lt;runtime/Exception.h&gt;
</span><span class="cx"> #include &lt;wtf/MainThread.h&gt;
</span><span class="cx"> #include &lt;wtf/Ref.h&gt;
</span><span class="cx"> 
</span><del>-// FIXME: This is a layering violation.
-#include &quot;JSDOMWindow.h&quot;
-
-#if PLATFORM(IOS)
-#include &quot;Document.h&quot;
-#endif
-
</del><span class="cx"> using namespace Inspector;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -357,7 +352,7 @@
</span><span class="cx">     m_destructionObservers.remove(&amp;observer);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ScriptExecutionContext::sanitizeScriptError(String&amp; errorMessage, int&amp; lineNumber, int&amp; columnNumber, String&amp; sourceURL, Deprecated::ScriptValue&amp; error, CachedScript* cachedScript)
</del><ins>+bool ScriptExecutionContext::sanitizeScriptError(String&amp; errorMessage, int&amp; lineNumber, int&amp; columnNumber, String&amp; sourceURL, JSC::Strong&lt;JSC::Unknown&gt;&amp; error, CachedScript* cachedScript)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(securityOrigin());
</span><span class="cx">     if (cachedScript) {
</span><span class="lines">@@ -369,10 +364,10 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     errorMessage = &quot;Script error.&quot;;
</span><del>-    sourceURL = String();
</del><ins>+    sourceURL = { };
</ins><span class="cx">     lineNumber = 0;
</span><span class="cx">     columnNumber = 0;
</span><del>-    error = Deprecated::ScriptValue();
</del><ins>+    error = { };
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -420,7 +415,7 @@
</span><span class="cx">     int line = lineNumber;
</span><span class="cx">     int column = columnNumber;
</span><span class="cx">     String sourceName = sourceURL;
</span><del>-    Deprecated::ScriptValue error = exception &amp;&amp; exception-&gt;value() ? Deprecated::ScriptValue(vm(), exception-&gt;value()) : Deprecated::ScriptValue();
</del><ins>+    JSC::Strong&lt;JSC::Unknown&gt; error = exception &amp;&amp; exception-&gt;value() ? JSC::Strong&lt;JSC::Unknown&gt;(vm(), exception-&gt;value()) : JSC::Strong&lt;JSC::Unknown&gt;();
</ins><span class="cx">     sanitizeScriptError(message, line, column, sourceName, error, cachedScript);
</span><span class="cx"> 
</span><span class="cx">     ASSERT(!m_inDispatchErrorEvent);
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -31,19 +31,17 @@
</span><span class="cx"> #include &quot;DOMTimer.h&quot;
</span><span class="cx"> #include &quot;SecurityContext.h&quot;
</span><span class="cx"> #include &quot;Supplementable.h&quot;
</span><ins>+#include &lt;heap/HandleTypes.h&gt;
</ins><span class="cx"> #include &lt;runtime/ConsoleTypes.h&gt;
</span><span class="cx"> #include &lt;wtf/CrossThreadTask.h&gt;
</span><span class="cx"> #include &lt;wtf/Function.h&gt;
</span><span class="cx"> #include &lt;wtf/HashSet.h&gt;
</span><span class="cx"> 
</span><del>-namespace Deprecated {
-class ScriptValue;
-}
-
</del><span class="cx"> namespace JSC {
</span><span class="cx"> class Exception;
</span><span class="cx"> class ExecState;
</span><span class="cx"> class VM;
</span><ins>+template &lt;typename T&gt; class Strong;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -94,7 +92,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual String resourceRequestIdentifier() const { return String(); };
</span><span class="cx"> 
</span><del>-    bool sanitizeScriptError(String&amp; errorMessage, int&amp; lineNumber, int&amp; columnNumber, String&amp; sourceURL, Deprecated::ScriptValue&amp; error, CachedScript* = nullptr);
</del><ins>+    bool sanitizeScriptError(String&amp; errorMessage, int&amp; lineNumber, int&amp; columnNumber, String&amp; sourceURL, JSC::Strong&lt;JSC::Unknown&gt;&amp; error, CachedScript* = nullptr);
</ins><span class="cx">     void reportException(const String&amp; errorMessage, int lineNumber, int columnNumber, const String&amp; sourceURL, JSC::Exception*, RefPtr&lt;Inspector::ScriptCallStack&gt;&amp;&amp;, CachedScript* = nullptr);
</span><span class="cx"> 
</span><span class="cx">     void addConsoleMessage(MessageSource, MessageLevel, const String&amp; message, const String&amp; sourceURL, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (210080 => 210081)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp        2016-12-21 23:11:37 UTC (rev 210080)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp        2016-12-21 23:33:37 UTC (rev 210081)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx">         // We don't bother checking the askedToTerminate() flag here, because exceptions should *always* be reported even if the thread is terminated.
</span><span class="cx">         // This is intentionally different than the behavior in MessageWorkerTask, because terminated workers no longer deliver messages (section 4.6 of the WebWorker spec), but they do report exceptions.
</span><span class="cx"> 
</span><del>-        bool errorHandled = !workerObject-&gt;dispatchEvent(ErrorEvent::create(errorMessage, sourceURL, lineNumber, columnNumber, Deprecated::ScriptValue()));
</del><ins>+        bool errorHandled = !workerObject-&gt;dispatchEvent(ErrorEvent::create(errorMessage, sourceURL, lineNumber, columnNumber, { }));
</ins><span class="cx">         if (!errorHandled)
</span><span class="cx">             context.reportException(errorMessage, lineNumber, columnNumber, sourceURL, nullptr, nullptr);
</span><span class="cx">     });
</span></span></pre>
</div>
</div>

</body>
</html>