<!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>[189143] 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/189143">189143</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-08-28 22:45:41 -0700 (Fri, 28 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update bindings test results after
https://bugs.webkit.org/show_bug.cgi?id=148591
JSCallbackData::invokeCallback() should return the Exception to the caller
* bindings/scripts/test/JS/JSTestCallback.cpp:
(WebCore::JSTestCallback::callbackWithNoParam):
(WebCore::JSTestCallback::callbackWithArrayParam):
(WebCore::JSTestCallback::callbackWithSerializedScriptValueParam):
(WebCore::JSTestCallback::callbackWithStringList):
(WebCore::JSTestCallback::callbackWithBoolean):
(WebCore::JSTestCallback::callbackRequiresThisToPass):
* bindings/scripts/test/JS/JSTestCallbackFunction.cpp:
(WebCore::JSTestCallbackFunction::callbackWithNoParam):
(WebCore::JSTestCallbackFunction::callbackWithArrayParam):
(WebCore::JSTestCallbackFunction::callbackWithSerializedScriptValueParam):
(WebCore::JSTestCallbackFunction::callbackWithStringList):
(WebCore::JSTestCallbackFunction::callbackWithBoolean):
(WebCore::JSTestCallbackFunction::callbackRequiresThisToPass):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189142 => 189143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-08-29 05:05:24 UTC (rev 189142)
+++ trunk/Source/WebCore/ChangeLog        2015-08-29 05:45:41 UTC (rev 189143)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-08-28 Alexey Proskuryakov <ap@apple.com>
+
+ Update bindings test results after
+ https://bugs.webkit.org/show_bug.cgi?id=148591
+
+ JSCallbackData::invokeCallback() should return the Exception to the caller
+
+ * bindings/scripts/test/JS/JSTestCallback.cpp:
+ (WebCore::JSTestCallback::callbackWithNoParam):
+ (WebCore::JSTestCallback::callbackWithArrayParam):
+ (WebCore::JSTestCallback::callbackWithSerializedScriptValueParam):
+ (WebCore::JSTestCallback::callbackWithStringList):
+ (WebCore::JSTestCallback::callbackWithBoolean):
+ (WebCore::JSTestCallback::callbackRequiresThisToPass):
+ * bindings/scripts/test/JS/JSTestCallbackFunction.cpp:
+ (WebCore::JSTestCallbackFunction::callbackWithNoParam):
+ (WebCore::JSTestCallbackFunction::callbackWithArrayParam):
+ (WebCore::JSTestCallbackFunction::callbackWithSerializedScriptValueParam):
+ (WebCore::JSTestCallbackFunction::callbackWithStringList):
+ (WebCore::JSTestCallbackFunction::callbackWithBoolean):
+ (WebCore::JSTestCallbackFunction::callbackRequiresThisToPass):
+
</ins><span class="cx"> 2015-08-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> JSCallbackData::invokeCallback() should return the Exception to the caller
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp (189142 => 189143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp        2015-08-29 05:05:24 UTC (rev 189142)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp        2015-08-29 05:45:41 UTC (rev 189143)
</span><span class="lines">@@ -129,9 +129,11 @@
</span><span class="cx"> ExecState* exec = m_data->globalObject()->globalExec();
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx">
</span><del>- bool raisedException = false;
- m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithNoParam"), &raisedException);
- return !raisedException;
</del><ins>+ NakedPtr<Exception> returnedException;
+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithNoParam"), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallback::callbackWithArrayParam(RefPtr<Float32Array> arrayParam)
</span><span class="lines">@@ -147,9 +149,11 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(arrayParam)));
</span><span class="cx">
</span><del>- bool raisedException = false;
- m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithArrayParam"), &raisedException);
- return !raisedException;
</del><ins>+ NakedPtr<Exception> returnedException;
+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithArrayParam"), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallback::callbackWithSerializedScriptValueParam(PassRefPtr<SerializedScriptValue> srzParam, const String& strArg)
</span><span class="lines">@@ -166,9 +170,11 @@
</span><span class="cx"> args.append(srzParam ? srzParam->deserialize(exec, castedThis->globalObject(), 0) : jsNull());
</span><span class="cx"> args.append(jsStringWithCache(exec, strArg));
</span><span class="cx">
</span><del>- bool raisedException = false;
- m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithSerializedScriptValueParam"), &raisedException);
- return !raisedException;
</del><ins>+ NakedPtr<Exception> returnedException;
+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithSerializedScriptValueParam"), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallback::callbackWithStringList(PassRefPtr<DOMStringList> listParam)
</span><span class="lines">@@ -184,9 +190,11 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(listParam)));
</span><span class="cx">
</span><del>- bool raisedException = false;
- m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithStringList"), &raisedException);
- return !raisedException;
</del><ins>+ NakedPtr<Exception> returnedException;
+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithStringList"), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallback::callbackWithBoolean(bool boolParam)
</span><span class="lines">@@ -202,9 +210,11 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsBoolean(boolParam));
</span><span class="cx">
</span><del>- bool raisedException = false;
- m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithBoolean"), &raisedException);
- return !raisedException;
</del><ins>+ NakedPtr<Exception> returnedException;
+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackWithBoolean"), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallback::callbackRequiresThisToPass(int longParam, TestNode* testNodeParam)
</span><span class="lines">@@ -221,9 +231,11 @@
</span><span class="cx"> args.append(jsNumber(longParam));
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(testNodeParam)));
</span><span class="cx">
</span><del>- bool raisedException = false;
- m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackRequiresThisToPass"), &raisedException);
- return !raisedException;
</del><ins>+ NakedPtr<Exception> returnedException;
+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Object, Identifier::fromString(exec, "callbackRequiresThisToPass"), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp (189142 => 189143)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp        2015-08-29 05:05:24 UTC (rev 189142)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallbackFunction.cpp        2015-08-29 05:45:41 UTC (rev 189143)
</span><span class="lines">@@ -74,10 +74,12 @@
</span><span class="cx"> ExecState* exec = m_data->globalObject()->globalExec();
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx">
</span><del>- bool raisedException = false;
</del><ins>+ NakedPtr<Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><del>- m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), &raisedException);
- return !raisedException;
</del><ins>+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallbackFunction::callbackWithArrayParam(RefPtr<Float32Array> arrayParam)
</span><span class="lines">@@ -93,10 +95,12 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(arrayParam)));
</span><span class="cx">
</span><del>- bool raisedException = false;
</del><ins>+ NakedPtr<Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><del>- m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), &raisedException);
- return !raisedException;
</del><ins>+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallbackFunction::callbackWithSerializedScriptValueParam(PassRefPtr<SerializedScriptValue> srzParam, const String& strArg)
</span><span class="lines">@@ -113,10 +117,12 @@
</span><span class="cx"> args.append(srzParam ? srzParam->deserialize(exec, castedThis->globalObject(), 0) : jsNull());
</span><span class="cx"> args.append(jsStringWithCache(exec, strArg));
</span><span class="cx">
</span><del>- bool raisedException = false;
</del><ins>+ NakedPtr<Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><del>- m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), &raisedException);
- return !raisedException;
</del><ins>+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallbackFunction::callbackWithStringList(PassRefPtr<DOMStringList> listParam)
</span><span class="lines">@@ -132,10 +138,12 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(listParam)));
</span><span class="cx">
</span><del>- bool raisedException = false;
</del><ins>+ NakedPtr<Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><del>- m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), &raisedException);
- return !raisedException;
</del><ins>+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallbackFunction::callbackWithBoolean(bool boolParam)
</span><span class="lines">@@ -151,10 +159,12 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsBoolean(boolParam));
</span><span class="cx">
</span><del>- bool raisedException = false;
</del><ins>+ NakedPtr<Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><del>- m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), &raisedException);
- return !raisedException;
</del><ins>+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSTestCallbackFunction::callbackRequiresThisToPass(int longParam, TestNode* testNodeParam)
</span><span class="lines">@@ -171,10 +181,12 @@
</span><span class="cx"> args.append(jsNumber(longParam));
</span><span class="cx"> args.append(toJS(exec, m_data->globalObject(), WTF::getPtr(testNodeParam)));
</span><span class="cx">
</span><del>- bool raisedException = false;
</del><ins>+ NakedPtr<Exception> returnedException;
</ins><span class="cx"> UNUSED_PARAM(exec);
</span><del>- m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), &raisedException);
- return !raisedException;
</del><ins>+ m_data->invokeCallback(args, JSCallbackData::CallbackType::Function, Identifier(), returnedException);
+ if (returnedException)
+ reportException(exec, returnedException);
+ return !returnedException;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>