<!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>[189140] 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/189140">189140</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 19:31:23 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSCallbackData::invokeCallback() should return the Exception to the caller
https://bugs.webkit.org/show_bug.cgi?id=148591
Reviewed by Mark Lam.
JSCallbackData::invokeCallback() calls a callback function. If this
function throws an exception, it will report it and clear it on the VM.
However, in the case of NodeFilter, the DOM specification clearly states
that we are supposed to rethrow the exception [1].
Once way to support this is to have JSCallbackData::invokeCallback()
return the Exception to the caller and let the caller decide what to do
with it (i.e. report it or rethrow it).
There is no actual behavior change in this patch. This slight
refactoring is in preparation for Bug 148415.
[1] https://dom.spec.whatwg.org/#traversal
Some more context at:
https://www.w3.org/Bugs/Public/show_bug.cgi?id=17713#c16
* bindings/js/JSCallbackData.cpp:
(WebCore::JSCallbackData::invokeCallback):
* bindings/js/JSCallbackData.h:
* bindings/js/JSCustomSQLStatementErrorCallback.cpp:
(WebCore::JSSQLStatementErrorCallback::handleEvent):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateCallbackImplementation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCallbackDatacpp">trunk/Source/WebCore/bindings/js/JSCallbackData.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCallbackDatah">trunk/Source/WebCore/bindings/js/JSCallbackData.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomSQLStatementErrorCallbackcpp">trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189139 => 189140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-29 02:28:51 UTC (rev 189139)
+++ trunk/Source/WebCore/ChangeLog 2015-08-29 02:31:23 UTC (rev 189140)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-08-28 Chris Dumez <cdumez@apple.com>
+
+ JSCallbackData::invokeCallback() should return the Exception to the caller
+ https://bugs.webkit.org/show_bug.cgi?id=148591
+
+ Reviewed by Mark Lam.
+
+ JSCallbackData::invokeCallback() calls a callback function. If this
+ function throws an exception, it will report it and clear it on the VM.
+ However, in the case of NodeFilter, the DOM specification clearly states
+ that we are supposed to rethrow the exception [1].
+
+ Once way to support this is to have JSCallbackData::invokeCallback()
+ return the Exception to the caller and let the caller decide what to do
+ with it (i.e. report it or rethrow it).
+
+ There is no actual behavior change in this patch. This slight
+ refactoring is in preparation for Bug 148415.
+
+ [1] https://dom.spec.whatwg.org/#traversal
+
+ Some more context at:
+ https://www.w3.org/Bugs/Public/show_bug.cgi?id=17713#c16
+
+ * bindings/js/JSCallbackData.cpp:
+ (WebCore::JSCallbackData::invokeCallback):
+ * bindings/js/JSCallbackData.h:
+ * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
+ (WebCore::JSSQLStatementErrorCallback::handleEvent):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateCallbackImplementation):
+
</ins><span class="cx"> 2015-08-28 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Remove unused CSSBasicShape::m_referenceBox
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCallbackDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.cpp (189139 => 189140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2015-08-29 02:28:51 UTC (rev 189139)
+++ trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2015-08-29 02:31:23 UTC (rev 189140)
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> delete static_cast<JSCallbackData*>(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSCallbackData::invokeCallback(MarkedArgumentBuffer& args, CallbackType method, PropertyName functionName, bool* raisedException)
</del><ins>+JSValue JSCallbackData::invokeCallback(MarkedArgumentBuffer& args, CallbackType method, PropertyName functionName, NakedPtr<Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(callback());
</span><del>- return invokeCallback(callback(), args, method, functionName, raisedException);
</del><ins>+ return invokeCallback(callback(), args, method, functionName, returnedException);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSCallbackData::invokeCallback(JSValue thisValue, MarkedArgumentBuffer& args, CallbackType method, PropertyName functionName, bool* raisedException)
</del><ins>+JSValue JSCallbackData::invokeCallback(JSValue thisValue, MarkedArgumentBuffer& args, CallbackType method, PropertyName functionName, NakedPtr<Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(callback());
</span><span class="cx"> ASSERT(globalObject());
</span><span class="lines">@@ -84,20 +84,13 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(context, callType, callData);
</span><span class="cx">
</span><del>- NakedPtr<Exception> exception;
</del><ins>+ returnedException = nullptr;
</ins><span class="cx"> JSValue result = context->isDocument()
</span><del>- ? JSMainThreadExecState::call(exec, function, callType, callData, thisValue, args, exception)
- : JSC::call(exec, function, callType, callData, thisValue, args, exception);
</del><ins>+ ? JSMainThreadExecState::call(exec, function, callType, callData, thisValue, args, returnedException)
+ : JSC::call(exec, function, callType, callData, thisValue, args, returnedException);
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didCallFunction(cookie, context);
</span><span class="cx">
</span><del>- if (exception) {
- reportException(exec, exception);
- if (raisedException)
- *raisedException = true;
- return result;
- }
-
</del><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCallbackDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.h (189139 => 189140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCallbackData.h 2015-08-29 02:28:51 UTC (rev 189139)
+++ trunk/Source/WebCore/bindings/js/JSCallbackData.h 2015-08-29 02:31:23 UTC (rev 189140)
</span><span class="lines">@@ -67,8 +67,8 @@
</span><span class="cx"> JSDOMGlobalObject* globalObject() { return m_globalObject.get(); }
</span><span class="cx">
</span><span class="cx"> enum class CallbackType { Function, Object, FunctionOrObject };
</span><del>- JSC::JSValue invokeCallback(JSC::MarkedArgumentBuffer&, CallbackType, JSC::PropertyName functionName, bool* raisedException = nullptr);
- JSC::JSValue invokeCallback(JSC::JSValue thisValue, JSC::MarkedArgumentBuffer&, CallbackType, JSC::PropertyName functionName, bool* raisedException = nullptr);
</del><ins>+ JSC::JSValue invokeCallback(JSC::MarkedArgumentBuffer&, CallbackType, JSC::PropertyName functionName, NakedPtr<JSC::Exception>& returnedException);
+ JSC::JSValue invokeCallback(JSC::JSValue thisValue, JSC::MarkedArgumentBuffer&, CallbackType, JSC::PropertyName functionName, NakedPtr<JSC::Exception>& returnedException);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> JSC::Strong<JSC::JSObject> m_callback;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomSQLStatementErrorCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp (189139 => 189140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2015-08-29 02:28:51 UTC (rev 189139)
+++ trunk/Source/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp 2015-08-29 02:31:23 UTC (rev 189140)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "JSSQLError.h"
</span><span class="cx"> #include "JSSQLTransaction.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><ins>+#include <runtime/Exception.h>
</ins><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><span class="lines">@@ -53,9 +54,11 @@
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), transaction));
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), error));
</span><span class="cx">
</span><del>- bool raisedException = false;
- JSValue result = m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), &raisedException);
- if (raisedException) {
</del><ins>+ NakedPtr<Exception> returnedException;
+ JSValue result = m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException) {
+ reportException(exec, returnedException);
+
</ins><span class="cx"> // The spec says:
</span><span class="cx"> // "If the error callback returns false, then move on to the next statement..."
</span><span class="cx"> // "Otherwise, the error callback did not return false, or there was no error callback"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (189139 => 189140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-29 02:28:51 UTC (rev 189139)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-08-29 02:31:23 UTC (rev 189140)
</span><span class="lines">@@ -3662,7 +3662,7 @@
</span><span class="cx"> push(@implContent, " args.append(" . NativeToJSValue($param, 1, $interfaceName, $paramName, "m_data") . ");\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push(@implContent, "\n bool raisedException = false;\n");
</del><ins>+ push(@implContent, "\n NakedPtr<Exception> returnedException;\n");
</ins><span class="cx">
</span><span class="cx"> my $propertyToLookup = "Identifier::fromString(exec, \"${functionName}\")";
</span><span class="cx"> my $invokeMethod = "JSCallbackData::CallbackType::FunctionOrObject";
</span><span class="lines">@@ -3678,8 +3678,13 @@
</span><span class="cx"> # https://heycam.github.io/webidl/#es-user-objects
</span><span class="cx"> $invokeMethod = "JSCallbackData::CallbackType::Object";
</span><span class="cx"> }
</span><del>- push(@implContent, " m_data->invokeCallback(args, $invokeMethod, $propertyToLookup, &raisedException);\n");
- push(@implContent, " return !raisedException;\n");
</del><ins>+ push(@implContent, " m_data->invokeCallback(args, $invokeMethod, $propertyToLookup, returnedException);\n");
+
+ # FIXME: We currently just report the exception. We should probably add an extended attribute to indicate when
+ # we want the exception to be rethrown instead.
+ push(@implContent, " if (returnedException)\n");
+ push(@implContent, " reportException(exec, returnedException);\n");
+ push(@implContent, " return !returnedException;\n");
</ins><span class="cx"> push(@implContent, "}\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>